Dashboards: Fix timescale hypertable (the dump didnt work very well, …

…"requests" had become a partitioned, but not proper hypertable). Also added a nice Makefile so you can run "make build down up" to refresh everything
SvenskaSpel · Dec 2, 2022 · 622d713 · 622d713
1 parent 816bf09
commit 622d713
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 5,495 deletions.
diff --git a/locust_plugins/dashboards/Makefile b/locust_plugins/dashboards/Makefile
@@ -0,0 +1,9 @@
+build:
+	cd locust-timescale && make build
+	cd locust-grafana && make build
+
+down:
+	locust-compose down -v
+
+up:
+	locust-compose up
diff --git a/locust_plugins/dashboards/docker-compose.yml b/locust_plugins/dashboards/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   postgres:
-    image: cyberw/locust-timescale:4
+    image: cyberw/locust-timescale:5
     networks:
       - timenet
     expose:

diff --git a/locust_plugins/dashboards/locust-timescale/Dockerfile b/locust_plugins/dashboards/locust-timescale/Dockerfile
@@ -4,4 +4,4 @@ RUN apk add bash curl jq
 # Grafana setup commands
 COPY *.sh /commands/
 # Import table and index definitions on startup
-COPY timescale_schema.sql /docker-entrypoint-initdb.d/
+COPY *.sql /docker-entrypoint-initdb.d/
diff --git a/locust_plugins/dashboards/locust-timescale/Makefile b/locust_plugins/dashboards/locust-timescale/Makefile
@@ -1,4 +1,4 @@
-TAG=4
+TAG=5
 IMAGE_NAME=cyberw/locust-timescale:$(TAG)
 
 build:
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    TAG=4
+    TAG=5
     IMAGE_NAME=cyberw/locust-timescale:$(TAG)
     build:
@@ Expand Down @@