Merge pull request #11 from libremfg/update_2022.01

Update to match current versions of services as at 2022.01
libremfg · Jan 15, 2022 · 6d5709b · 6d5709b
2 parents 2c282fb + 9a38feb
commit 6d5709b
Show file tree

Hide file tree

Showing 18 changed files with 3,673 additions and 2,805 deletions.
diff --git a/Standalone/docker-compose.yml b/Standalone/docker-compose.yml
@@ -40,7 +40,7 @@ services:
       - 8000:8000
     command: dgraph-ratel
   libre-ui:
-    image:  ghcr.io/spruik/libre-admin-ui:main
+    image:  ghcr.io/spruik/libre-admin-ui:v0.2.1
     ports:
       - 80:80
     environment:
@@ -64,37 +64,21 @@ services:
       - 8083:8083
       - 18083:18083
     restart: always
+    environment:
+      - EMQX_LOADED_PLUGINS=emqx_recon,emqx_retainer,emqx_management,emqx_dashboard,emqx_auth_mnesia
+      - EMQX_ALLOW_ANONYMOUS=true
+      - EMQX_ACL_NOMATCH=allow
     container_name: mqtt
     healthcheck:
       interval: 5s
       timeout: 3s
       retries: 5
       test: ["CMD", "curl", "-f", "http://mqtt:18083"]
-  libre-server:
-    image: ghcr.io/spruik/libre-server:0.0.4
-    restart: always
-    ports:
-      - 4001:80
-    environment:
-      - LIBRE_DQL_URL=alpha:9080
-      - LIBRE_GRAPHQL_ENDPOINT=http://alpha:8080/graphql
-      - INFLUX_TOKEN=mytokenmytokenmytoken
-      - INFLUX_ORG=Libre
-      - INFLUX_BUCKET=Libre
-      - INFLUX_URL=http://influxdb:8086
-    volumes:
-      - ./libre-server/config:/etc/config
-    depends_on:
-      alpha:
-        condition: service_healthy
-      mqtt:
-        condition: service_healthy
-      influxdb:
-        condition: service_healthy
-    container_name: libre-server
   libre-core:
-    image: ghcr.io/spruik/libre-core:0.2.0
+    image: ghcr.io/spruik/libre-core:0.3.8
     restart: always
+    ports:
+      - 4002:4002
     environment:
       - LIBRE_CONFIG_FILE=/etc/config/config.json
     volumes:
@@ -106,7 +90,7 @@ services:
       - "dgraph-init"
     container_name: libre-core
   graphql-pubsub:
-    image: ghcr.io/spruik/graphql-pubsub:0.0.3
+    image: ghcr.io/spruik/graphql-pubsub:0.0.5
     restart: always
     environment:
       - LIBRE_CONFIG_FILE=/etc/config/config.json
@@ -121,7 +105,7 @@ services:
         condition: service_healthy
     container_name: graphql-pubsub
   libre-workflow-pubsub:
-    image: ghcr.io/spruik/libre-workflow-pubsub:0.0.1
+    image: ghcr.io/spruik/libre-workflow-pubsub:0.0.7
     restart: always
     environment:
       - LIBRE_CONFIG_FILE=/etc/config/config.json
@@ -178,17 +162,20 @@ services:
   libre-gateway:
     ports:
       - 4000:4000
-    image: ghcr.io/spruik/libre-gateway:tom
+    image: ghcr.io/spruik/libre-gateway:0.1.1
     restart: always
     container_name: libre-gateway
     environment:
       - GRAPHQL_ENDPOINT=http://alpha:8080
-      - LIBRE_SERVER_ENDPOINT=http://libre-server
+      - LIBRE_CORE_ENDPOINT=http://libre-core:4002
       - LIBRE_AUTH_CERT_URL=https://demo-libremfg.us.auth0.com/.well-known/jwks.json
     volumes:
       - type: bind
         source: ./libre-gateway/supergraph.graphql
         target: /app/supergraph.graphql
+      - type: bind
+        source: ./libre-gateway/supergraph.yaml
+        target: /app/supergraph.yaml
     depends_on:
       alpha:
         condition: service_healthy
@@ -200,9 +187,9 @@ services:
       interval: 5s
       timeout: 3s
       retries: 5
-      test: ["CMD", "curl", "-f", "http://libre-gateway:4000/health"]
+      test: ["CMD", "curl", "-f", "http://libre-gateway:4000"]
   grafana:
-    image: grafana/grafana:latest
+    image: grafana/grafana:8.2.1
     container_name: grafana
     restart: always
     environment:
@@ -231,7 +218,7 @@ services:
       alpha:
           condition: service_healthy
   libre-edge-agent:
-    image: ghcr.io/spruik/libre-edge-agent:0.2.6
+    image: ghcr.io/spruik/libre-edge-agent:0.4.0
     restart: always
     environment:
       - LIBRE_CONFIG_FILE=/etc/config/config.json
@@ -245,3 +232,36 @@ services:
       influxdb:
         condition: service_healthy
     container_name: libre-edge-agent
+  appsmith:
+    image: appsmith/appsmith-ce
+    container_name: appsmith-ce
+    environment:
+      - APPSMITH_MAIL_ENABLED=true
+      - APPSMITH_MAIL_FROM=app@libremfg.ai
+      - APPSMITH_REPLY_TO=app@libremfg.ai
+      - APPSMITH_MAIL_HOST=smtp.sendgrid.net
+      - APPSMITH_MAIL_PORT=587
+      - APPSMITH_MAIL_SMTP_TLS_ENABLED=true
+      - APPSMITH_MAIL_USERNAME=apikey
+      - APPSMITH_MAIL_PASSWORD=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
+      - APPSMITH_MAIL_SMTP_AUTH=true
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_GOOGLE_ISSUER-URI=https://demo-libremfg.us.auth0.com/
+      - SPRING_SECURITY_OAUTH2_CLIENT_PROVIDER_GOOGLE_USER-NAME-ATTRIBUTE=email
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT-ID=cEye379jRD9TCroW6LRwsNf7LQkMYOBj
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT-SECRET=1QR-caDuhi-UcM0YzgKcip4wIdiTZrljH8K3h8WOHe_Zqg34Vi-7q3V0E6P-0JA0
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_AUTHORIZATION-GRANT-TYPE=authorization_code
+      - SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_REDIRECT-URI={baseUrl}/login/oauth2/code/{registrationId}
+    ports:
+      - "3080:80"
+      - "443:443"
+      - "9001:9001"
+    volumes:
+      - ./stacks:/appsmith-stacks
+    labels:
+      com.centurylinklabs.watchtower.enable: "true"
+  auto_update:
+    image: containrrr/watchtower:latest-dev
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    # Update check interval in seconds.
+    command: --interval 300 --label-enable --cleanup
diff --git a/Standalone/grafana/data/grafana.db b/Standalone/grafana/data/grafana.db
diff --git a/Standalone/grafana/plugins/isaozler-paretochart-panel/MANIFEST.txt b/Standalone/grafana/plugins/isaozler-paretochart-panel/MANIFEST.txt
@@ -8,29 +8,30 @@ Hash: SHA512
   "signedByOrg": "isaozler",
   "signedByOrgName": "isaozler",
   "plugin": "isaozler-paretochart-panel",
-  "version": "0.3.1",
-  "time": 1603372560562,
+  "version": "0.3.2",
+  "time": 1634578771777,
   "keyId": "7e4d0c6a708866e7",
   "files": {
-    "module.js.LICENSE.txt": "0d8f66cd4afb566cb5b7e1540c68f43b939d3eba12ace290f18abc4f4cb53ed0",
-    "plugin.json": "c0d85061e6a40d983645609cca70a31ff5d3e73fac4f9116c19498a62bb7ac81",
-    "module.js.map": "3e67f0ac4e81f73469af1639919e8bf1cda3b429a2b6bb3eb99c41b0171baf18",
-    "module.js": "bb8d403096e95ebbedd29b3c24d197c387c8ba636e34270057dbe41d8fa8ff52",
-    "README.md": "947f70f475b673392e5160859d7853f5174c07d75694e9aa32b6bcbe28338ec2",
-    "index.html": "2fa2c4168c5bb7b8502989f437e4a1a71e663702b0ec9c01530215c8c026dcaf",
+    "README.md": "f0f6cc5bedf2ae869608d7c92e1279b928927a677325109e86792b02784e879b",
     "LICENSE": "b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1",
+    "module.js": "4e9e68d002a5f30100b50c4f90a9f9590fb449b0e0765dbd6e7744f9dfc3bfbd",
+    "module.js.LICENSE.txt": "0d8f66cd4afb566cb5b7e1540c68f43b939d3eba12ace290f18abc4f4cb53ed0",
     "img/logo.svg": "e7c5922188799e8471cc135b191d78b9ad8a3f1480c5e14e2310867d23c6b40e",
+    "img/machines--icon.svg": "b876d9beeec3ba18949b31a4777a06f60c90e5192e3794fadab69e92c4980d23",
     "img/production-env--impression.jpg": "ac0a3f596f3058500935563be4fac11a51902663d267ee8c9d5b075650049630",
-    "img/pareto-chart-edit-panel.jpg": "d20e4634c6b5de6e0432503a8e155c89ba6a4ffd29d748ae10b7da208eeca9aa"
+    "img/pareto-chart-edit-panel.jpg": "d20e4634c6b5de6e0432503a8e155c89ba6a4ffd29d748ae10b7da208eeca9aa",
+    "index.html": "2fa2c4168c5bb7b8502989f437e4a1a71e663702b0ec9c01530215c8c026dcaf",
+    "plugin.json": "c832698cb5f2eeec85fca1cd85081f2af35b5eb6ce27a9292fa2dd7966755e3d",
+    "module.js.map": "0739a317602f0de352a62fcb6afce7f38291caca87edb8deb835de2dd05ab295"
   }
 }
 -----BEGIN PGP SIGNATURE-----
 Version: OpenPGP.js v4.10.1
 Comment: https://openpgpjs.org
 
-wqEEARMKAAYFAl+RhhAACgkQfk0ManCIZuf4gAIFFq2eznXc1RDNJUP6g3mL
-Tpo1o27Sw1MdC8y1QE7M6FzJZIsSvFL+I3fm/DW7B25G3VDx9ufYLYeOrZcH
-WnRXyigCCQGBezKGNgce2MV9k6ATpRhpTiyLSmotYZof+uEvLG02gxUejgaC
-VDxfkaAQtFXqJt3reSW93luIPX7/yuwt6Gtz1Q==
-=uNqj
+wqIEARMKAAYFAmFtsVMACgkQfk0ManCIZueUmwIJAVkLXZanpUyVBcWWc17f
+rfJp0qfpSliF1bkK9BCBY33MCcStped/+HQv4xIbRnSfdIvg3a0AFSlv9Kuq
+xlti71KNAgkBZ3ZAINK59BfWh7/NPC7UCLvcG6yIvjkUohjcrbM98uoJ32wK
+ug96y5NnrhLM/wpswLuHSR17ycirkcmCzIRvJq8=
+=ienU
 -----END PGP SIGNATURE-----
diff --git a/Standalone/grafana/plugins/isaozler-paretochart-panel/README.md b/Standalone/grafana/plugins/isaozler-paretochart-panel/README.md
@@ -35,28 +35,3 @@ SELECT _label_, _count_, ...
 FROM _table_
 ```
 ---
-
-## IDE / Development
-
-1. Install dependencies
-```BASH
-yarn install
-```
-2. Development mode in watch mode
-```BASH
-yarn dev
-```
-or
-```BASH
-yarn watch
-```
-3. Build plugin to production
-```BASH
-yarn build
-```
-4. Deploy ready for production
-
-```BASH
-# This will create a pareto-chart.zip file which you can add manually to your Grafana environment.
-yarn deploy
-```
diff --git a/Standalone/grafana/plugins/isaozler-paretochart-panel/module.js b/Standalone/grafana/plugins/isaozler-paretochart-panel/module.js
diff --git a/Standalone/grafana/plugins/isaozler-paretochart-panel/module.js.map b/Standalone/grafana/plugins/isaozler-paretochart-panel/module.js.map
diff --git a/Standalone/grafana/plugins/isaozler-paretochart-panel/plugin.json b/Standalone/grafana/plugins/isaozler-paretochart-panel/plugin.json
@@ -19,8 +19,8 @@
       { "name": "Pareto Chart Dashboard Impression", "path": "img/production-env--impression.jpg" },
       { "name": "Pareto Chart Edit Dashboard", "path": "img/pareto-chart-edit-panel.jpg" }
     ],
-    "version": "0.3.1",
-    "updated": "2020-10-22"
+    "version": "0.3.2",
+    "updated": "2021-10-18"
   },
   "dependencies": {
     "grafanaDependency": ">=7.0.0",

diff --git a/Standalone/grafana/plugins/marcusolsson-gantt-panel/CHANGELOG.md b/Standalone/grafana/plugins/marcusolsson-gantt-panel/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.7.5 (2022-01-07)
+
+[Full changelog](https://github.com/marcusolsson/grafana-gantt-panel/compare/v0.7.4...v0.7.5)
+
+### Bug fixes
+
+- `experiments` is undefined ([#69](https://github.com/marcusolsson/grafana-gantt-panel/issues/69)) (thanks [@prOOrc](https://github.com/pr00rc)!)
+
 ## 0.7.4 (2021-09-05)
 
 [Full changelog](https://github.com/marcusolsson/grafana-gantt-panel/compare/v0.7.3...v0.7.4)

diff --git a/Standalone/grafana/plugins/marcusolsson-gantt-panel/LICENSE b/Standalone/grafana/plugins/marcusolsson-gantt-panel/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Marcus Olsson
+   Copyright 2022 Marcus Olsson
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Standalone/grafana/plugins/marcusolsson-gantt-panel/MANIFEST.txt b/Standalone/grafana/plugins/marcusolsson-gantt-panel/MANIFEST.txt
@@ -8,28 +8,28 @@ Hash: SHA512
   "signedByOrg": "marcusolsson",
   "signedByOrgName": "Marcus Olsson",
   "plugin": "marcusolsson-gantt-panel",
-  "version": "0.7.4",
-  "time": 1630847863678,
+  "version": "0.7.5",
+  "time": 1641552991497,
   "keyId": "7e4d0c6a708866e7",
   "files": {
-    "module.js.map": "29a2dba2fd25e2d7c6f107d922e7fac4790d3d944fc3d92950a05c80e9007f3c",
-    "CHANGELOG.md": "74e540ac1f9b90f5f1be76beaa1a4fd29f213c69bf4e7336ed3a11174d36db75",
-    "module.js": "61cdac78545abe5c085fae3f87c308693b7862da80cd5722e23b7cac1d85abd0",
+    "CHANGELOG.md": "bbc5ce985c5fd5d23af9a35675543e8fc43b408796b6ecca409e16c368f4333c",
+    "module.js.map": "330647eae34cd9e6b993fecaf4cc8316757f8bf84e839e289c7b21e02ce07f14",
+    "module.js": "4fa4e704d6e2621785cd4ded595f3f50f20399cb2524134c550480ff10da7d89",
     "img/light.png": "fcb10b8798a4f3b60b064d9e6eaf64e1221d1f161de985e73ce78d3802b24a36",
     "img/dark.png": "a99b6f7e1cdc1cf8a5b1d5558bed4ee9b2998063b2c0d8932bf76b20241fead4",
     "img/logo.svg": "360d6e805c3d99714c01ee23efbdbb84bd9c279471acec4d5bed0901a8488e22",
-    "LICENSE": "73852a67e3154ce23adc3d8e8047e6859039c9b1fcb8b428612e30bd908230af",
-    "README.md": "0e03eee69e33703ac62e4ea70ad587231ea3dc05dea461f2123bb679af446f41",
-    "plugin.json": "05f1e3b37666799b20b1edbd4a181139a39d221363827015e93321ed8774363f"
+    "LICENSE": "5ab170e6de9123e3d011f1cd05e8dc2586954c1e889aac499bf5d98dc83e2839",
+    "plugin.json": "447f276abdbd40e83609a4ec15e290321b61dda1033b3a3dfda8b773fce1a21e",
+    "README.md": "0e03eee69e33703ac62e4ea70ad587231ea3dc05dea461f2123bb679af446f41"
   }
 }
 -----BEGIN PGP SIGNATURE-----
 Version: OpenPGP.js v4.10.1
 Comment: https://openpgpjs.org
 
-wqEEARMKAAYFAmE0w3cACgkQfk0ManCIZueePQIJAUA8ugkPoWlQg2mOrUtQ
-QDBDW2PTjcVrliWRkbi/rEcEs3bBLmtfkm8xn/lmxV2ucGDHBzHNxqcV+lwz
-7NMWVnZPAgQK34/Se4AzYkYnhKM7NiDki1yJ6OyGY3APeyutq499s+ZkIz7O
-DhLA5lT97HhR92RP9k72aeJQsDszaiv4xU+Cdg==
-=dJ+/
+wqAEARMKAAYFAmHYHF8ACgkQfk0ManCIZue3hAIIr8ZSCXvCRkETaM6z8rCw
+K2RGcAiE3DGGKSEc4h40OTlPa+fNi6OwIgoLzEJdvYsGSiSJKpGfHvcuceUC
+nk8FxxsCBjjfXa5RSzsk9LbVgEE1oozrnEjMzbrU6LUn6LMpb3jvHivfeHhf
+K6tPQ0kiehTwPvD5xoIG2xMGTd+tQMnf+Ydq
+=TDaD
 -----END PGP SIGNATURE-----
diff --git a/Standalone/grafana/plugins/marcusolsson-gantt-panel/module.js b/Standalone/grafana/plugins/marcusolsson-gantt-panel/module.js
diff --git a/Standalone/grafana/plugins/marcusolsson-gantt-panel/module.js.map b/Standalone/grafana/plugins/marcusolsson-gantt-panel/module.js.map
diff --git a/Standalone/grafana/plugins/marcusolsson-gantt-panel/plugin.json b/Standalone/grafana/plugins/marcusolsson-gantt-panel/plugin.json
@@ -21,8 +21,8 @@
       { "name": "Gantt (Dark)", "path": "img/dark.png" },
       { "name": "Gantt (Light)", "path": "img/light.png" }
     ],
-    "version": "0.7.4",
-    "updated": "2021-09-05"
+    "version": "0.7.5",
+    "updated": "2022-01-07"
   },
 
   "dependencies": {