birbit stack

* Remove invalid dashboard and panel ids from alert rules

* Pin grafana and prometheus versions

* Configure custom grafana server URL

.gitea/workflows/test-k8s-deploy.yml

@@ -1,14 +1,11 @@
 name: K8s Deploy Test
 
 on:
-  pull_request:
-    branches: '*'
   push:
-    branches:
+    branches: '*'
-      - main
+    paths:
-      - ci-test
+      - '!**'
-    paths-ignore:
+      - '.gitea/workflows/triggers/fixturenet-laconicd-test'
-      - '.gitea/workflows/triggers/*'
 
 jobs:
   test:

.gitea/workflows/triggers/test-k8s-deploy

@@ -0,0 +1 @@
+Change this file to trigger running the test-k8s-deploy CI job

stack_orchestrator/data/compose/docker-compose-fixturenet-laconicd.yml

@@ -2,7 +2,7 @@ services:
   laconicd:
     restart: unless-stopped
     image: cerc/laconicd:local
-    command: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
+    entrypoint: ["sh", "/docker-entrypoint-scripts.d/create-fixturenet.sh"]
     volumes:
       # The cosmos-sdk node's database directory:
       - laconicd-data:/root/.laconicd
@@ -15,12 +15,12 @@ services:
       - "6060"
       - "26657"
       - "26656"
-      - "9473"
+      - "9473:9473"
       - "8545"
       - "8546"
       - "9090"
       - "9091"
-      - "1317"
+      - "1317:1317"
   cli:
     image: cerc/laconic-registry-cli:local
     volumes:

stack_orchestrator/data/compose/docker-compose-geojson.yml

@@ -0,0 +1,8 @@
+version: "3.2"
+
+services:
+  geojson:
+    image: cerc/geojson:local
+    restart: always
+    ports:
+      - 0.0.0.0:8080:8080

stack_orchestrator/data/compose/docker-compose-grafana.yml

@@ -2,8 +2,10 @@ version: "3.7"
 
 services:
   grafana:
-    image: grafana/grafana
+    image: grafana/grafana:10.2.2
     restart: always
+    environment:
+      GF_SERVER_ROOT_URL: ${GF_SERVER_ROOT_URL}
     volumes:
       - ../config/monitoring/grafana/provisioning:/etc/grafana/provisioning
       - ../config/monitoring/grafana/dashboards:/etc/grafana/dashboards

stack_orchestrator/data/compose/docker-compose-prom-server.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   prometheus:
-    image: prom/prometheus
+    image: prom/prometheus:v2.49.1
     restart: always
     volumes:
       - ../config/monitoring/prometheus:/etc/prometheus

stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml

@@ -95,14 +95,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: censures_diff_external
@@ -191,14 +187,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: claims_diff_external
@@ -287,14 +279,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: conditional_star_release_diff_external
@@ -383,14 +371,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: delegated_sending_diff_external
@@ -479,14 +463,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: ecliptic_diff_external
@@ -575,14 +555,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: linear_star_release_diff_external
@@ -671,14 +647,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: polls_diff_external
@@ -767,14 +739,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
 
@@ -865,14 +833,10 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false
       - uid: merkl_sushiswap_diff_external
@@ -961,13 +925,9 @@ groups:
               maxDataPoints: 43200
               refId: condition
               type: math
-        dashboardUid: cb9b746a-9abc-482e-9214-5231e0dd75ca
-        panelId: 24
         noDataState: Alerting
         execErrState: Alerting
         for: 15m
         annotations:
-          __dashboardUid__: cb9b746a-9abc-482e-9214-5231e0dd75ca
-          __panelId__: "24"
           summary: Watcher {{ index $labels "instance" }} of group {{ index $labels "job" }} is falling behind external head by {{ index $values "diff" }}
         isPaused: false

stack_orchestrator/data/container-build/cerc-birbit/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build the birbit image
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/birbit:local -f ${CERC_REPO_BASE_DIR}/birbit/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/birbit

stack_orchestrator/data/container-build/cerc-geojson/Dockerfile

@@ -0,0 +1,11 @@
+FROM node:14
+
+WORKDIR /app
+
+COPY . .
+
+RUN npm install && npm run build
+
+EXPOSE 8080
+
+CMD ["npm", "run", "serve"]

stack_orchestrator/data/container-build/cerc-geojson/build.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Build the geojson image
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/geojson:local -f ${CERC_CONTAINER_BASE_DIR}/cerc-geojson/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/geojson.io
+#docker build -t cerc/geojson:local -f ${CERC_REPO_BASE_DIR}/geojson.io/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/geojson.io

stack_orchestrator/data/stacks/birbit/README.md

@@ -0,0 +1,3 @@
+# birbit
+
+takes geo-tagged images, publishes the metadata on chain, then generates a geojson front end of that geo data

stack_orchestrator/data/stacks/birbit/stack.yml

@@ -0,0 +1,19 @@
+version: "0.1"
+name: birbit
+repos:
+  #- github.com/zramsay/birbit
+  - github.com/mapbox/geojson.io
+containers:
+  #- cerc/birbit
+  - cerc/geojson
+pods:
+    # configurable process that reads from chain and generates a view for the front end
+    # for MVP is basically does nothing, b/c FE view is  reading all records
+    # imagine a 'watcher' for a specific view
+    #- birbit
+    # front end, gets its file from kubo;
+    # https://github.com/mapbox/geojson.io/blob/main/API.md#datadatatextx-url
+    # deployed via kubernetes
+  - geojson
+    # hosts all the dot geojson files that are required to generated views
+  - kubo

stack_orchestrator/data/stacks/monitoring/README.md

@@ -140,6 +140,10 @@ Set the following env variables in the deployment env config file (`monitoring-d
   # External ETH RPC endpoint (filecoin)
   # (Optional, default: https://api.node.glif.io/rpc/v1)
   CERC_FIL_RPC_ENDPOINT=
+
+  # Grafana server host URL (used in various links in alerts, etc.)
+  # (Optional, default: http://localhost:3000)
+  GF_SERVER_ROOT_URL=
   ```
 
 ## Start the stack

stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md

@@ -130,6 +130,10 @@ Set the following env variables in the deployment env config file (`monitoring-w
   ```bash
   # Infura key to be used
   CERC_INFURA_KEY=
+
+  # Grafana server host URL to be used
+  # (Optional, default: http://localhost:3000)
+  GF_SERVER_ROOT_URL=
   ```
 
 ## Start the stack

tests/k8s-deploy/run-deploy-test.sh

@@ -63,7 +63,9 @@ echo "Version reported is: ${reported_version_string}"
 echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
 rm -rf $CERC_REPO_BASE_DIR
 mkdir -p $CERC_REPO_BASE_DIR
-# Test basic stack-orchestrator deploy
+$TEST_TARGET_SO --stack test setup-repositories
+$TEST_TARGET_SO --stack test build-containers
+# Test basic stack-orchestrator deploy to k8s
 test_deployment_dir=$CERC_REPO_BASE_DIR/test-deployment-dir
 test_deployment_spec=$CERC_REPO_BASE_DIR/test-deployment-spec.yml
 $TEST_TARGET_SO --stack test deploy --deploy-to k8s-kind init --output $test_deployment_spec --config CERC_TEST_PARAM_1=PASSED