Bump prometheus and grafana (#52)

* bump prometheus and grafana

* update args names

* update args names

* Update args in Dockerfiles

---------

Co-authored-by: dappnodedev <[email protected]>

Author: pablomendezroyo

dappnode_package.json

@@ -4,6 +4,18 @@
   "description": "This package privately and locally collects and displays metrics related to your dappnode and its packages. Based on Grafana and Prometheus. It is recommended to also install the package Node-Exporter if you want system metrics. You can find a guide on how to set up your monitoring system in the next link https://forum.dappnode.io/t/begginer-friendly-install-monitoring-system-on-dappnode-using-dms-package/623",
   "shortDescription": "DAppNode Monitoring Service",
   "type": "service",
+  "upstream": [
+    {
+      "repo": "prometheus/prometheus",
+      "version": "2.52.0",
+      "arg": "UPSTREAM_VERSION_PROMETHEUS"
+    },
+    {
+      "repo": "grafana/grafana",
+      "version": "11.0.0",
+      "arg": "UPSTREAM_VERSION_GRAFANA"
+    }
+  ],
   "architectures": ["linux/amd64"],
   "mainService": "grafana",
   "author": "DAppNode Association <[email protected]> (https://github.com/dappnode)",

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: grafana
       args:
-        UPSTREAM_VERSION: 9.3.6
+        UPSTREAM_VERSION_GRAFANA: 11.0.0
     image: "grafana.dms.dnp.dappnode.eth:1.0.1"
     restart: always
     volumes:
@@ -13,7 +13,7 @@ services:
     build:
       context: prometheus
       args:
-        UPSTREAM_VERSION: v2.30.0
+        UPSTREAM_VERSION_PROMETHEUS: v2.52.0
     image: "prometheus.dms.dnp.dappnode.eth:1.0.1"
     restart: always
     volumes:

grafana/Dockerfile

@@ -1,6 +1,6 @@
-ARG UPSTREAM_VERSION
+ARG UPSTREAM_VERSION_GRAFANA
 
-FROM grafana/grafana:${UPSTREAM_VERSION}
+FROM grafana/grafana:${UPSTREAM_VERSION_GRAFANA}
 
 USER root
 

prometheus/Dockerfile

@@ -1,6 +1,6 @@
-ARG UPSTREAM_VERSION
+ARG UPSTREAM_VERSION_PROMETHEUS
 
-FROM prom/prometheus:${UPSTREAM_VERSION}
+FROM prom/prometheus:${UPSTREAM_VERSION_PROMETHEUS}
 
 COPY prometheus.yml /etc/prometheus/