Using Grafana image instead of building it

herlesupreeth · Oct 24, 2024 · 5f6da8f · 5f6da8f
1 parent 0a6c673
commit 5f6da8f
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 108 deletions.
diff --git a/.env b/.env
@@ -129,12 +129,14 @@ SRS_GNB_IP=172.22.0.37
 
 # GRAFANA
 GRAFANA_IP=172.22.0.39
+GRAFANA_USERNAME=open5gs
+GRAFANA_PASSWORD=open5gs
 
 # UE IPv4 Subnet Range for APN=internet
-UE_IPV4_INTERNET=192.168.100.0/24
+UE_IPV4_INTERNET=192.168.200.0/24
 
 # UE IPv4 Subnet Range for APN=ims
-UE_IPV4_IMS=192.168.101.0/24
+UE_IPV4_IMS=192.168.201.0/24
 
 # Maximum Number of UEs
 MAX_NUM_UE=1024
diff --git a/4g-external-ims-deploy.yaml b/4g-external-ims-deploy.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo:6.0
@@ -320,15 +319,23 @@ services:
       default:
         ipv4_address: ${METRICS_IP}
   grafana:
-    build: ./grafana
-    image: docker_grafana
+    image: grafana/grafana:10.1.5
     container_name: grafana
     env_file:
       - .env
     volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/:/etc/grafana/provisioning/
       - ./grafana:/mnt/grafana
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+      #- GF_INSTALL_PLUGINS=${GRAFANA_INSTALL_PLUGINS}
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_PATHS_DATA=/var/lib/grafana
+      - METRICS_IP=${METRICS_IP}
     expose:
       - "3000/tcp"
     ports:
@@ -342,5 +349,7 @@ networks:
       config:
         - subnet: ${TEST_NETWORK}
 volumes:
+  grafana_data:
+    name: grafana_data
   mongodbdata: {}
-  dbdata: {}
+  dbdata: {}
diff --git a/4g-volte-deploy.yaml b/4g-volte-deploy.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo:6.0
@@ -456,15 +455,23 @@ services:
       default:
         ipv4_address: ${METRICS_IP}
   grafana:
-    build: ./grafana
-    image: docker_grafana
+    image: grafana/grafana:10.1.5
     container_name: grafana
     env_file:
       - .env
     volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/:/etc/grafana/provisioning/
       - ./grafana:/mnt/grafana
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+      #- GF_INSTALL_PLUGINS=${GRAFANA_INSTALL_PLUGINS}
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_PATHS_DATA=/var/lib/grafana
+      - METRICS_IP=${METRICS_IP}
     expose:
       - "3000/tcp"
     ports:
@@ -478,5 +485,7 @@ networks:
       config:
         - subnet: ${TEST_NETWORK}
 volumes:
+  grafana_data:
+    name: grafana_data
   mongodbdata: {}
   dbdata: {}
diff --git a/deploy-all.yaml b/deploy-all.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo:6.0
@@ -664,15 +663,23 @@ services:
       default:
         ipv4_address: ${METRICS_IP}
   grafana:
-    build: ./grafana
-    image: docker_grafana
+    image: grafana/grafana:10.1.5
     container_name: grafana
     env_file:
       - .env
     volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/:/etc/grafana/provisioning/
       - ./grafana:/mnt/grafana
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+      #- GF_INSTALL_PLUGINS=${GRAFANA_INSTALL_PLUGINS}
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_PATHS_DATA=/var/lib/grafana
+      - METRICS_IP=${METRICS_IP}
     expose:
       - "3000/tcp"
     ports:
@@ -686,5 +693,7 @@ networks:
       config:
         - subnet: ${TEST_NETWORK}
 volumes:
+  grafana_data:
+    name: grafana_data
   mongodbdata: {}
   dbdata: {}
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
diff --git a/grafana/open5gs_dashboard.json → grafana/dashboards/open5gs_dashboard.json b/grafana/open5gs_dashboard.json → grafana/dashboards/open5gs_dashboard.json
diff --git a/grafana/open5gs_dashboard.yml → grafana/dashboards/open5gs_dashboard.yml b/grafana/open5gs_dashboard.yml → grafana/dashboards/open5gs_dashboard.yml
@@ -5,4 +5,4 @@ providers:
     folder: Services # The folder where to place the dashboards
     type: file
     options:
-      path: /var/lib/grafana/dashboards
+      path: /etc/grafana/provisioning/dashboards
diff --git a/grafana/datasources/prometheus_open5gs.yml b/grafana/datasources/prometheus_open5gs.yml
@@ -0,0 +1,9 @@
+apiVersion: 1
+
+datasources:
+  - name: Open5Gs
+    type: prometheus
+    access: proxy
+    url: http://${METRICS_IP}:9090
+    disableDeletion: false
+    editable: true
diff --git a/grafana/grafana_init.sh b/grafana/grafana_init.sh
diff --git a/grafana/prometheus_open5gs.yml b/grafana/prometheus_open5gs.yml
diff --git a/sa-deploy.yaml b/sa-deploy.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo:6.0
@@ -305,15 +304,23 @@ services:
       default:
         ipv4_address: ${METRICS_IP}
   grafana:
-    build: ./grafana
-    image: docker_grafana
+    image: grafana/grafana:10.1.5
     container_name: grafana
     env_file:
       - .env
     volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/:/etc/grafana/provisioning/
       - ./grafana:/mnt/grafana
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+      #- GF_INSTALL_PLUGINS=${GRAFANA_INSTALL_PLUGINS}
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_PATHS_DATA=/var/lib/grafana
+      - METRICS_IP=${METRICS_IP}
     expose:
       - "3000/tcp"
     ports:
@@ -327,4 +334,6 @@ networks:
       config:
         - subnet: ${TEST_NETWORK}
 volumes:
-  mongodbdata: {}
+  grafana_data:
+    name: grafana_data
+  mongodbdata: {}
diff --git a/sa-vonr-deploy.yaml b/sa-vonr-deploy.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo:6.0
@@ -490,15 +489,23 @@ services:
       default:
         ipv4_address: ${SMSC_IP}
   grafana:
-    build: ./grafana
-    image: docker_grafana
+    image: grafana/grafana:10.1.5
     container_name: grafana
     env_file:
       - .env
     volumes:
+      - grafana_data:/var/lib/grafana
+      - ./grafana/:/etc/grafana/provisioning/
       - ./grafana:/mnt/grafana
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+      #- GF_INSTALL_PLUGINS=${GRAFANA_INSTALL_PLUGINS}
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+      - GF_PATHS_DATA=/var/lib/grafana
+      - METRICS_IP=${METRICS_IP}
     expose:
       - "3000/tcp"
     ports:
@@ -512,5 +519,7 @@ networks:
       config:
         - subnet: ${TEST_NETWORK}
 volumes:
+  grafana_data:
+    name: grafana_data
   mongodbdata: {}
   dbdata: {}