add grafana

deploy/asapo_helm_chart/asapo/Chart.yaml

@@ -25,6 +25,10 @@ dependencies:
   - name: influxdb
     version: "~0.4.3"
     repository: "https://charts.bitnami.com/bitnami"
+#  - name: grafana
+#    version: "~1.3.7"
+#    repository: "https://charts.bitnami.com/bitnami"
+
 #  - name: elasticsearch
 #    version: "~11.0.13"
 #    repository: "https://charts.bitnami.com/bitnami"

deploy/asapo_helm_chart/asapo/templates/grafana-deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: asapo-grafana
+  labels:
+    app: asapo-grafana
+spec:
+  replicas: {{ .Values.ownServices.grafana.replicaCount }}
+  selector:
+    matchLabels:
+      app: asapo-grafana
+  template:
+    metadata:
+      labels:
+        app: asapo-grafana
+    spec:
+      volumes:
+        - name: asapo-grafana
+          persistentVolumeClaim:
+            claimName: asapo-online-pv
+      containers:
+        - name: asapo-grafana
+          image: "grafana/grafana:6.7.1-ubuntu"
+          ports:
+            - containerPort: {{ .Values.ownServices.grafana.port }}
+          volumeMounts:
+            - mountPath: /var/lib/grafana
+              name: asapo-grafana
+          env:
+            - name: GF_SERVER_ROOT_URL
+              value: "%(protocol)s://%(domain)s/{{ .Release.Namespace }}/asapo-grafana/"
+            - name: GF_SERVER_SERVE_FROM_SUB_PATH
+              value: "true"
\ No newline at end of file

deploy/asapo_helm_chart/asapo/templates/storage.yaml

@@ -18,6 +18,18 @@ spec:
   storageClassName: nfs-storage
   accessModes:
     - ReadWriteMany
+  resources:
+    requests:
+      storage: 1Gi
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: asapo-grafana
+spec:
+  storageClassName: standard
+  accessModes:
+    - ReadWriteOnce
   resources:
     requests:
       storage: 1Gi
\ No newline at end of file

deploy/asapo_helm_chart/asapo/values.yaml

@@ -15,6 +15,7 @@ ownServices:
     serviceName: asapo-discovery
     replicaCount: 1
     port: 5008
+    sidecarLogs: true
     _exposeServiceExtrernally: false
   receiver:
     serviceName: asapo-receiver
@@ -38,6 +39,12 @@ ownServices:
     port: 5011
     sidecarLogs: true
     _exposeServiceExtrernally: true
+  grafana:
+    serviceName: asapo-grafana
+    replicaCount: 1
+    port: 3000
+    sidecarLogs: false
+    _exposeServiceExtrernally: false
 
 
 common:
@@ -46,20 +53,13 @@ common:
   onlineDir: "/test_online"
   asapoVersionTag: "develop.20.03-10-g06dc0be"
   nodesPrefix: g
+
 influxdb:
   authEnabled: false
   influxdb:
     updateStrategy: Recreate
     service:
       port: 8086
-    ingress:
-      enabled: true
-      annotations:
-        kubernetes.io/ingress.class: "nginx"
-        nginx.ingress.kubernetes.io/whitelist-source-range: 131.169.0.0/16
-      hosts:
-        - name: "*.desy.de"
-          path_template: "/{{ .Release.Namespace }}/perfview"
 
 elasticsearch:
   global:
@@ -81,4 +81,4 @@ elasticsearch:
         nginx.ingress.kubernetes.io/whitelist-source-range: 131.169.0.0/16
       hosts:
         - name: "*.desy.de"
-          path_template: "/{{ .Release.Namespace }}/logsview"
\ No newline at end of file
+          path_template: "/{{ .Release.Namespace }}/logsview"