new database

ENVDB.matest

@@ -4,7 +4,7 @@ PGHOST=`kubectl get services traefik -n system -o jsonpath="{.status.loadBalance
 PGPASSWORD=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGPASSWORD}" | base64 --decode`
 PGUSER=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGUSER}" | base64 --decode`
 PGSSLMODE=`kubectl get secrets ma-db-cred -n $N -o jsonpath="{.data.PGSSLMODE}" | base64 --decode`
-PGDATABASE="ma"
+PGDATABASE="matest"
 export PGUSER PGHOST PGPASSWORD PGSSLMODE PGDATABASE
 
 MA_CONF=`cat config-test.json`

deployment/roll-credentials.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-export PGUSER=`kubectl get secret -n database timescaledb -o jsonpath="{.data.superuser-username}" | base64 --decode`
-export PGHOST=`kubectl get services traefik -n system -o jsonpath="{.status.loadBalancer.ingress[0].ip}"`
-export PGPASSWORD=`kubectl get secret -n database timescaledb -o jsonpath="{.data.superuser-password}" | base64 --decode`
-export PGSSLMODE=require
-
+. ~/Workspace/mykubernetesenv/ENVDB1
 
 DATABASE=ma
 LOGIN=ma
@@ -33,7 +29,7 @@ kubectl create secret generic ma-db-cred \
   --from-literal=PGUSER="$LOGIN" \
   --from-literal=PGPASSWORD="$PASSWORD" \
   --from-literal=PGDATABASE="$DATABASE" \
-  --from-literal=PGHOST="timescaledb.database.svc.cluster.local" \
+  --from-literal=PGHOST="database.database1.svc.cluster.local" \
   --from-literal=PGSSLMODE="require" | \
   kubectl apply -f - -n $NAMESPACE
 

src/ma/archiver/archiver.go

@@ -7,7 +7,7 @@ import "time"
 //import "net/url"
 import "ma/mqtt"
 //import "ma/config"
-import "ma/counter"
+//import "ma/counter"
 import "ma/database"
 
 var dbh *database.DatabaseHandle
@@ -31,6 +31,5 @@ func InputArchiver() {
 func handleMessage(message database.Message) {
   // log.Printf("Archiving Timestamp: %s, Topic: %s, Payload: %s", message.Time, message.Topic, message.Payload)
   dbh.StoreMessage(&message)
-  counter.S("Stored")
 }
 

src/ma/mqtt/mqtt.go

@@ -122,7 +122,9 @@ func StartMqttClient() {
   if token := mqttClient.Connect(); token.Wait() && token.Error() != nil {
     log.Fatalf("Unable to connect to broker %s, error %s", broker, token.Error())
   }
-  //log.Printf("Successfully connected to broker %s", broker)
+  log.Printf("Successfully connected to broker %s", broker)
+  log.Printf("Include topics: %s", config.Config.IncludeTopics)
+  log.Printf("Exclude topics: %s", config.Config.ExcludeTopics)
 
   go outputDispatcher(mqttClient)