Move to official Grafana container image on docker.io

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

diff --git a/learn-metrics.yaml b/learn-metrics.yaml
index 6966d782784f1423579ec55caef08cdfaeeec434..df18ac1c57e5108fb6265e4c45273a1a8b14b526 100644 (file)
--- a/learn-metrics.yaml
+++ b/learn-metrics.yaml
@@ -6,21 +6,26 @@ metadata:
   name: learn-metrics
 spec:
   containers:
   name: learn-metrics
 spec:
   containers:

-  - image: quay.io/bitnami/grafana:latest
+  - image: docker.io/grafana/grafana

     name: grafana
     env:
     - name: GF_SECURITY_ADMIN_PASSWORD
       value: foobar
     name: grafana
     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:
     ports:
     - containerPort: 3000
       hostPort: 3000
       protocol: TCP
     volumeMounts:

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

       readOnly: true
 
       readOnly: true
 

-  - image: docker.io/prom/prometheus:latest
+  - image: quay.io/prometheus/prometheus:latest

     name: prometheus
     ports:
     - containerPort: 9090
     name: prometheus
     ports:
     - containerPort: 9090


@@ -28,24 +33,29 @@ spec:
       protocol: TCP
     volumeMounts:
       - name: prometheus-config
       protocol: TCP
     volumeMounts:
       - name: prometheus-config

-        mountPath: /etc/prometheus/prometheus.yml
+        mountPath: /etc/prometheus

         readOnly: true
 
         readOnly: true
 

-  - image: quay.io/bitnami/nginx
+  - image: quay.io/jitesoft/nginx

     name: httpd
     name: httpd

+    ports:
+    - containerPort: 80
+      hostPort: 3002
+      protocol: TCP

     volumeMounts:
     - name: http
     volumeMounts:
     - name: http

-      mountPath: /app
+      mountPath: /usr/local/nginx/html

       readOnly: true
 
   volumes:
   - hostPath:
       readOnly: true
 
   volumes:
   - hostPath:

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

   - hostPath:
   - hostPath:

-      path: ./conf-prometheus/prometheus.yml
-      type: File
+      path: ./prometheus-config

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