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 4d76cf97b920c923b130828fae6ced8917d86604..df18ac1c57e5108fb6265e4c45273a1a8b14b526 100644 (file)
--- a/learn-metrics.yaml
+++ b/learn-metrics.yaml
@@ -6,29 +6,57 @@ 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
       hostPort: 3001
       protocol: TCP
     name: prometheus
     ports:
     - containerPort: 9090
       hostPort: 3001
       protocol: TCP

+    volumeMounts:
+      - name: prometheus-config
+        mountPath: /etc/prometheus
+        readOnly: true
+
+  - image: quay.io/jitesoft/nginx
+    name: httpd
+    ports:
+    - containerPort: 80
+      hostPort: 3002
+      protocol: TCP
+    volumeMounts:
+    - name: http
+      mountPath: /usr/local/nginx/html
+      readOnly: true

 
   volumes:
   - hostPath:
 
   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:
+      path: ./prometheus-config
+    name: prometheus-config
+  - hostPath:
+      path: ./http
+    name: http