🔀 :: dashboard, namespace 추가

apps/kube-prometheus-stack/values.yaml

@@ -424,6 +424,18 @@ kube-prometheus-stack:
       requests:
         cpu: 10m
         memory: 256Mi
+    dashboardProviders:
+      dashboardproviders.yaml:
+        apiVersion: 1
+        providers:
+        - name: 'default'
+          orgId: 1
+          folder: 'default'
+          type: file
+          disableDeletion: false
+          editable: true
+          options:
+            path: /var/lib/grafana/dashboards/default
     datasources:
       datasources.yaml:
         apiVersion: 1
@@ -439,11 +451,11 @@ kube-prometheus-stack:
           url: http://kube-prometheus-stack-alertmanager.monitoring:9093
           editable: false
           access: proxy
-        - name: loki
-          type: loki
-          access: proxy
-          editable: false
-          url: http://loki-gateway
+        # - name: Loki
+        #   type: Loki
+        #   access: proxy
+        #   editable: false
+        #   url: http://loki-gateway.monitoring
     # dashboardsConfigMaps:
     #   xquare: "xquare-dashboards"
     grafana.ini:

apps/xquare-club/templates/grafanadashboard.yaml

@@ -0,0 +1,295 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: xquare-dashboards
+  labels:
+    grafana_dashboard: "1"
+data:
+{{- range .Values.clubs }}
+{{- $clubname := .name }}
+  {{ $clubname }}.json: |
+    {
+      "__inputs": [
+        {
+          "name": "DS_LOKI",
+          "label": "Loki",
+          "description": "",
+          "type": "datasource",
+          "pluginId": "loki",
+          "pluginName": "Loki"
+        }
+      ],
+      "__requires": [
+        {
+          "type": "grafana",
+          "id": "grafana",
+          "name": "Grafana",
+          "version": "7.1.0"
+        },
+        {
+          "type": "panel",
+          "id": "graph",
+          "name": "Graph",
+          "version": ""
+        },
+        {
+          "type": "panel",
+          "id": "logs",
+          "name": "Logs",
+          "version": ""
+        },
+        {
+          "type": "datasource",
+          "id": "loki",
+          "name": "Loki",
+          "version": "1.0.0"
+        }
+      ],
+      "annotations": {
+        "list": [
+          {
+            "$$hashKey": "object:75",
+            "builtIn": 1,
+            "datasource": "-- Grafana --",
+            "enable": true,
+            "hide": true,
+            "iconColor": "rgba(0, 211, 255, 1)",
+            "name": "Annotations & Alerts",
+            "type": "dashboard"
+          }
+        ]
+      },
+      "description": "Log Viewer Dashboard for Loki",
+      "editable": false,
+      "gnetId": 13639,
+      "graphTooltip": 0,
+      "id": null,
+      "iteration": 1608932746420,
+      "links": [
+        {
+          "$$hashKey": "object:59",
+          "icon": "bolt",
+          "includeVars": true,
+          "keepTime": true,
+          "tags": [],
+          "targetBlank": true,
+          "title": "View In Explore",
+          "type": "link",
+          "url": "/explore?orgId=1&left=[\"now-1h\",\"now\",\"Loki\",{\"expr\":\"{job=\\\"$app\\\"}\"},{\"ui\":[true,true,true,\"none\"]}]"
+        },
+        {
+          "$$hashKey": "object:61",
+          "icon": "external link",
+          "tags": [],
+          "targetBlank": true,
+          "title": "Learn LogQL",
+          "type": "link",
+          "url": "https://grafana.com/docs/loki/latest/logql/"
+        }
+      ],
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": true,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "Loki",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {},
+              "links": []
+            },
+            "overrides": []
+          },
+          "fill": 1,
+          "fillGradient": 0,
+          "gridPos": {
+            "h": 3,
+            "w": 24,
+            "x": 0,
+            "y": 0
+          },
+          "hiddenSeries": false,
+          "id": 6,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": false,
+            "total": false,
+            "values": false
+          },
+          "lines": false,
+          "linewidth": 1,
+          "nullPointMode": "null",
+          "percentage": false,
+          "pluginVersion": "7.1.0",
+          "pointradius": 2,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "sum(count_over_time({job=\"$app\"} |= \"$search\" [$__interval]))",
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeRegions": [],
+          "timeShift": null,
+          "title": "",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "$$hashKey": "object:168",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            },
+            {
+              "$$hashKey": "object:169",
+              "format": "short",
+              "label": null,
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ],
+          "yaxis": {
+            "align": false,
+            "alignLevel": null
+          }
+        },
+        {
+          "datasource": "Loki",
+          "fieldConfig": {
+            "defaults": {
+              "custom": {}
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 25,
+            "w": 24,
+            "x": 0,
+            "y": 3
+          },
+          "id": 2,
+          "maxDataPoints": "",
+          "options": {
+            "showLabels": false,
+            "showTime": true,
+            "sortOrder": "Descending",
+            "wrapLogMessage": false
+          },
+          "targets": [
+            {
+              "expr": "{job=\"$app\"} |= \"$search\" | logfmt",
+              "hide": false,
+              "legendFormat": "",
+              "refId": "A"
+            }
+          ],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "",
+          "transparent": true,
+          "type": "logs"
+        }
+      ],
+      "refresh": false,
+      "schemaVersion": 26,
+      "style": "dark",
+      "tags": [],
+      "templating": {
+        "list": [
+          {
+            "allValue": null,
+            "current": {},
+            "datasource": "Loki",
+            "definition": "label_values({job=~\"{{ $clubname }}.*\"}, job)",
+            "hide": 0,
+            "includeAll": false,
+            "label": "App",
+            "multi": false,
+            "name": "app",
+            "options": [],
+            "query": "label_values({job=~\"{{ $clubname }}.*\"}, job)",
+            "refresh": 1,
+            "regex": "",
+            "skipUrlSync": false,
+            "sort": 0,
+            "tagValuesQuery": "",
+            "tags": [],
+            "tagsQuery": "",
+            "type": "query",
+            "useTags": false
+          },
+          {
+            "current": {
+              "selected": false,
+              "text": "",
+              "value": ""
+            },
+            "hide": 0,
+            "label": "String Match",
+            "name": "search",
+            "options": [
+              {
+                "selected": true,
+                "text": "",
+                "value": ""
+              }
+            ],
+            "query": "",
+            "skipUrlSync": false,
+            "type": "textbox"
+          }
+        ]
+      },
+      "time": {
+        "from": "now-1h",
+        "to": "now"
+      },
+      "timepicker": {
+        "hidden": false,
+        "refresh_intervals": [
+          "10s",
+          "30s",
+          "1m",
+          "5m",
+          "15m",
+          "30m",
+          "1h",
+          "2h",
+          "1d"
+        ]
+      },
+      "timezone": "",
+      "title": "xquare {{ $clubname }} logs",
+      "uid": "{{ $clubname }}-loki-apps-dashboard",
+      "version": 13
+    }
+{{- end }}

apps/xquare-club/templates/namespace.yaml

@@ -0,0 +1,17 @@
+{{- range .Values.clubs }}
+{{- $clubname := .name }}
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ $clubname }}-stag
+  labels:
+    name: {{ $clubname }}-stag
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ $clubname }}-prod
+  labels:
+    name: {{ $clubname }}-prod
+{{- end }}