push to docker hub too

.gitlab-ci.yml

@@ -4,6 +4,8 @@ stages:
 
 variables:
   IMAGE_NAME: $CI_REGISTRY/$CI_PROJECT_PATH
+  HUB_IMAGE_NAME: $DOCKER_HUB_LOGIN/$CI_PROJECT_NAME
+
 
 dockerize:
   image: registry.hottis.de/dockerized/docker-bash:latest
@@ -19,6 +21,12 @@ dockerize:
     - if [ "$CI_COMMIT_TAG" != "" ]; then
         docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $IMAGE_NAME:${CI_COMMIT_TAG};
         docker push $IMAGE_NAME:${CI_COMMIT_TAG};
+
+        docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD;
+        docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
+        docker tag $IMAGE_NAME:${CI_COMMIT_SHORT_SHA} $HUB_IMAGE_NAME:latest;
+        docker push $HUB_IMAGE_NAME:${CI_COMMIT_TAG};
+        docker push $HUB_IMAGE_NAME:latest;
       fi
 
 .deploy:
@@ -49,9 +57,10 @@ dockerize:
     - docker network connect external-network $CONTAINER_NAME
  
 
-deploy-berresheim:
-  extends: .deploy
-  tags:
-    - berresheim-deployment-only
-  environment:
-    name: berresheim-production
+# deploy-berresheim:
+#   extends: .deploy
+#   tags:
+#     - berresheim-deployment-only
+#   environment:
+#     name: berresheim-production
+#

schema/create-schema.sql

@@ -1,5 +1,5 @@
 create database cem_monitoring;
--- create extension timescaledb;
+create extension timescaledb;
 
 
 
@@ -22,7 +22,7 @@ create table variable_t (
 );
 
 create table measurement_t (
-    time timestamp without time zone not null,
+    time timestamptz not null,
     variable integer references variable_t (id),
     value float
 );
@@ -32,23 +32,24 @@ select create_hypertable('measurement_t', 'time');
 insert into application_t (app_id, label) values('ku226', 'Kupferdreher Str. 226, Essen');
 insert into variable_t (app, converter_id, device_id, variable_id, label, unit, quantity)
 	values ((select id from application_t where app_id = 'ku226'), '1', 'bhkw', 'u', 'BHKW Spannung', 'V', 'voltage'),
-	       ((select id from application_t where app_id = 'ku226'), '1', 'bhkw', 'p', 'BHKW Leistung', 'W', 'power'),
+	       ((select id from application_t where app_id = 'ku226'), '1', 'bhkw', 'p', 'BHKW Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'bhkw', 'import', 'BHKW Energie Export', 'Wh', 'energy'),
                ((select id from application_t where app_id = 'ku226'), '1', 'bhkw', 'export', 'BHKW Energie Import', 'Wh', 'energy'),
                ((select id from application_t where app_id = 'ku226'), '1', 'pv', 'u', 'PV Spannung', 'V', 'voltage'),
-               ((select id from application_t where app_id = 'ku226'), '1', 'pv', 'p', 'PV Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '1', 'pv', 'p', 'PV Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'pv', 'import', 'PV Energie Export', 'Wh', 'energy'),
                ((select id from application_t where app_id = 'ku226'), '1', 'pv', 'export', 'PV Energie Import', 'Wh', 'energy'),
                ((select id from application_t where app_id = 'ku226'), '3', 'mains', 'import', 'Netz Energie Import', 'Wh', 'energy'),
-               ((select id from application_t where app_id = 'ku226'), '1', 'w1', 'p', 'Wohnung 1 Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '3', 'mains', 'p', 'Netz Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '1', 'w1', 'p', 'Wohnung 1 Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'w1', 'import', 'Wohnung 1 Energie Import', 'Wh', 'energy'),
-               ((select id from application_t where app_id = 'ku226'), '1', 'w2', 'p', 'Wohnung 2 Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '1', 'w2', 'p', 'Wohnung 2 Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'w2', 'import', 'Wohnung 2 Energie Import', 'Wh', 'energy'),
-               ((select id from application_t where app_id = 'ku226'), '1', 'w3', 'p', 'Wohnung 3 Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '1', 'w3', 'p', 'Wohnung 3 Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'w3', 'import', 'Wohnung 3 Energie Import', 'Wh', 'energy'),
-               ((select id from application_t where app_id = 'ku226'), '1', 'w4', 'p', 'Wohnung 4 Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '1', 'w4', 'p', 'Wohnung 4 Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'w4', 'import', 'Wohnung 4 Energie Import', 'Wh', 'energy'),
-               ((select id from application_t where app_id = 'ku226'), '1', 'w5', 'p', 'Wohnung 5 Leistung', 'W', 'power'),
+               ((select id from application_t where app_id = 'ku226'), '1', 'w5', 'p', 'Wohnung 5 Leistung', 'kW', 'power'),
                ((select id from application_t where app_id = 'ku226'), '1', 'w5', 'import', 'Wohnung 5 Energie Import', 'Wh', 'energy')
 	;
 
@@ -61,3 +62,20 @@ grant select on variable_t to preprocessor;
 grant insert on measurement_t to preprocessor;
 grant select on measurement_t to grafana;
 
+
+create view measurement_v as
+  select m.time as time, 
+         m.value as value, 
+	 v.quantity as quantity, 
+	 v.unit as unit, 
+	 v.label as variable, 
+	 a.label as application 
+    from measurement_t m, 
+         application_t a, 
+	 variable_t v 
+    where m.variable = v.id and 
+          v.app = a.id;
+
+grant select on measurement_v to grafana;
+
+