From 282e17556643ec684d1962b7e12f6f7a8c746c07 Mon Sep 17 00:00:00 2001 From: prathamesh0 <42446521+prathamesh0@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:02:10 +0530 Subject: [PATCH] Remove unnecessary hyperlinks and pin image versions (#706) * Remove invalid dashboard and panel ids from alert rules * Pin grafana and prometheus versions * Configure custom grafana server URL --- .../data/compose/docker-compose-grafana.yml | 4 +- .../compose/docker-compose-prom-server.yml | 2 +- .../config/monitoring/watcher-alert-rules.yml | 40 ------------------- .../data/stacks/monitoring/README.md | 4 ++ .../stacks/monitoring/monitoring-watchers.md | 4 ++ 5 files changed, 12 insertions(+), 42 deletions(-) diff --git a/stack_orchestrator/data/compose/docker-compose-grafana.yml b/stack_orchestrator/data/compose/docker-compose-grafana.yml index 4aa8d1e1..6d32e37b 100644 --- a/stack_orchestrator/data/compose/docker-compose-grafana.yml +++ b/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 diff --git a/stack_orchestrator/data/compose/docker-compose-prom-server.yml b/stack_orchestrator/data/compose/docker-compose-prom-server.yml index b085e295..9095b6dc 100644 --- a/stack_orchestrator/data/compose/docker-compose-prom-server.yml +++ b/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 diff --git a/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml b/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml index 7e26ba14..9df9472f 100644 --- a/stack_orchestrator/data/config/monitoring/watcher-alert-rules.yml +++ b/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 diff --git a/stack_orchestrator/data/stacks/monitoring/README.md b/stack_orchestrator/data/stacks/monitoring/README.md index 7b410478..74b1bff8 100644 --- a/stack_orchestrator/data/stacks/monitoring/README.md +++ b/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 diff --git a/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md b/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md index 3673b530..bce2d84b 100644 --- a/stack_orchestrator/data/stacks/monitoring/monitoring-watchers.md +++ b/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