diff --git a/scripts/govtool/config/templates/grafana-provisioning/dashboards/govtool.json b/scripts/govtool/config/templates/grafana-provisioning/dashboards/govtool.json index 70b42f887..fdb8da4c7 100644 --- a/scripts/govtool/config/templates/grafana-provisioning/dashboards/govtool.json +++ b/scripts/govtool/config/templates/grafana-provisioning/dashboards/govtool.json @@ -864,7 +864,7 @@ { "datasource": { "type": "loki", - "uid": "b0d64f25-3bca-4cc1-b8f3-6b391d88b442" + "uid": "a698987a-0cba-42a9-86aa-3ba65104ef72" }, "description": "Trace of every deploy made on this machine. This is a good place to start when something goes wrong.", "gridPos": { @@ -888,7 +888,7 @@ { "datasource": { "type": "loki", - "uid": "b0d64f25-3bca-4cc1-b8f3-6b391d88b442" + "uid": "a698987a-0cba-42a9-86aa-3ba65104ef72" }, "editorMode": "builder", "expr": "{filename=\"/var/log/deployment.log\"}", @@ -916,6 +916,6 @@ "timezone": "", "title": "GovTool basic stats", "uid": "e3697f62-6a01-4596-b626-d46141441b32", - "version": 44, + "version": 50, "weekStart": "" } diff --git a/scripts/govtool/config/templates/grafana-provisioning/datasources/datasource.yml b/scripts/govtool/config/templates/grafana-provisioning/datasources/datasource.yml index e1461426c..a4ea24d58 100644 --- a/scripts/govtool/config/templates/grafana-provisioning/datasources/datasource.yml +++ b/scripts/govtool/config/templates/grafana-provisioning/datasources/datasource.yml @@ -11,6 +11,8 @@ deleteDatasources: datasources: # name of the datasource. Required - name: Prometheus + # datasource UID. + uid: PBFA97CFB590B2093 # datasource type. Required type: prometheus # access mode. direct or proxy. Required @@ -51,6 +53,8 @@ datasources: # name of the datasource. Required - name: Loki + # datasource UID. + uid: a698987a-0cba-42a9-86aa-3ba65104ef72 # datasource type. Required type: loki # access mode. direct or proxy. Required @@ -74,9 +78,6 @@ datasources: # enable/disable with credentials headers withCredentials: # mark as default datasource. Max one per org - # enable/disable basic auth - basicAuth: false - # mark as default datasource. Max one per org isDefault: false version: 1 # allow users to edit datasources from the UI. diff --git a/scripts/govtool/utils.mk b/scripts/govtool/utils.mk index 7e72355ee..b69671472 100644 --- a/scripts/govtool/utils.mk +++ b/scripts/govtool/utils.mk @@ -3,8 +3,8 @@ ssh: export TERM=xterm-256color; \ ssh $(ssh_url) -.PHONY: docker -docker: +.PHONY: docker-compose +docker-compose: @:$(call check_defined, cardano_network) @:$(call check_defined, env) @:$(call check_defined, cmd)