Reorganize configs

[learn-metrics.git] / learn-metrics.yaml

diff --git a/learn-metrics.yaml b/learn-metrics.yaml
index 38cc24e09b1bf03e46695ec7962a613c55d0698e..3d6c678c4e75a0bacf92f7dcd7112c646119d788 100644 (file)
--- a/learn-metrics.yaml
+++ b/learn-metrics.yaml
@@ -11,16 +11,18 @@ spec:
     env:
     - name: GF_SECURITY_ADMIN_PASSWORD
       value: foobar
     env:
     - name: GF_SECURITY_ADMIN_PASSWORD
       value: foobar

+    - name: GF_PATHS_CONFIG
+      value: /grafana-config/grafana.ini

     ports:
     - containerPort: 3000
       hostPort: 3000
       protocol: TCP
     volumeMounts:
     - name: grafana-config
     ports:
     - containerPort: 3000
       hostPort: 3000
       protocol: TCP
     volumeMounts:
     - name: grafana-config

-      mountPath: /opt/bitnami/grafana/conf/grafana.ini
+      mountPath: /grafana-config

       readOnly: true
       readOnly: true

-    - name: grafana-datasource
-      mountPath: /etc/grafana/provisioning/datasources/datasource.yaml
+    - name: grafana-provisioning
+      mountPath: /etc/grafana/provisioning

       readOnly: true
 
   - image: quay.io/prometheus/prometheus:latest
       readOnly: true
 
   - image: quay.io/prometheus/prometheus:latest


@@ -43,15 +45,13 @@ spec:
 
   volumes:
   - hostPath:
 
   volumes:
   - hostPath:

-      path: ./conf-grafana/datasource.yaml
-      type: File
-    name: grafana-datasource
+      path: ./grafana-provisioning
+    name: grafana-provisioning

   - hostPath:
   - hostPath:

-      path: ./conf-grafana/grafana.ini
-      type: File
+      path: ./grafana-config

     name: grafana-config
   - hostPath:
     name: grafana-config
   - hostPath:

-      path: ./conf-prometheus
+      path: ./prometheus-config

     name: prometheus-config
   - hostPath:
       path: ./http
     name: prometheus-config
   - hostPath:
       path: ./http