grafana部署支持可变修改，支持kubesphere自带监控的模式

install/docker/requirements.txt

@@ -49,5 +49,5 @@ bleach==6.0.0               # HTML清理和链接化库
 pandas==2.1.1               # 数据处理
 beautifulsoup4==4.12.2      # 用于解析HTML和XML文档
 cffi==1.16.0
-
+clickhouse-driver==0.2.7    # sqllab对接clickhouse
 

install/kubernetes/istio/install-1.15.0.yaml

@@ -9503,7 +9503,7 @@ spec:
           secretName: istio-kubeconfig
           optional: true
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: istio-ingressgateway
@@ -9522,7 +9522,7 @@ spec:
       app: istio-ingressgateway
       istio: ingressgateway
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: istiod

install/kubernetes/istio/install.yaml

@@ -2949,7 +2949,7 @@ spec:
           secretName: istio-kubeconfig
           optional: true
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: istio-ingressgateway
@@ -2968,7 +2968,7 @@ spec:
       app: istio-ingressgateway
       istio: ingressgateway
 ---
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: istiod

install/kubernetes/prometheus/grafana/grafana-datasources.yml

@@ -1,9 +1,22 @@
 # 配置prometheus 默认数据源
 apiVersion: v1
-data:
-  prometheus.yaml: ewogICAgImFwaVZlcnNpb24iOiAxLAogICAgImRhdGFzb3VyY2VzIjogWwogICAgICAgIHsKICAgICAgICAgICAgImFjY2VzcyI6ICJwcm94eSIsCiAgICAgICAgICAgICJlZGl0YWJsZSI6IGZhbHNlLAogICAgICAgICAgICAibmFtZSI6ICJwcm9tZXRoZXVzIiwKICAgICAgICAgICAgIm9yZ0lkIjogMSwKICAgICAgICAgICAgInR5cGUiOiAicHJvbWV0aGV1cyIsCiAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovL3Byb21ldGhldXMtazhzLm1vbml0b3Jpbmcuc3ZjOjkwOTAiLAogICAgICAgICAgICAidmVyc2lvbiI6IDEKICAgICAgICB9CiAgICBdCn0=
-kind: Secret
+kind: ConfigMap
 metadata:
   name: grafana-datasources
   namespace: monitoring
-type: Opaque
+data:
+  prometheus.yaml: |-
+    {
+      "apiVersion": 1,
+      "datasources": [
+        {
+          "access": "proxy",
+          "editable": true,
+          "name": "prometheus",
+          "orgId": 1,
+          "type": "prometheus",
+          "url": "http://prometheus-k8s.monitoring.svc:9090",
+          "version": 1
+        }
+      ]
+    }

install/kubernetes/prometheus/grafana/grafana-dp.yml

@@ -85,8 +85,8 @@ spec:
         hostPath:
           path: /usr/share/zoneinfo/Asia/Shanghai
       - name: grafana-datasources
-        secret:
-          secretName: grafana-datasources
+        configMap:
+          name: grafana-datasources
       - configMap:
           name: grafana-dashboards
         name: grafana-dashboards

install/kubernetes/start.sh

@@ -75,7 +75,6 @@ kubectl apply -f ./prometheus/pv-pvc-hostpath.yaml
 kubectl apply -f ./prometheus/prometheus-main.yml
 sleep 5
 # 部署sm
-kubectl apply -f ./servicemonitor/alertmanager-sm.yml
 kubectl apply -f ./servicemonitor/coredns-sm.yml
 kubectl apply -f ./servicemonitor/kube-apiserver-sm.yml
 kubectl apply -f ./servicemonitor/kube-controller-manager-sm.yml
@@ -85,7 +84,6 @@ kubectl apply -f ./servicemonitor/kubestate-metrics-sm.yml
 kubectl apply -f ./servicemonitor/node-exporter-sm.yml
 kubectl apply -f ./servicemonitor/prometheus-operator-sm.yml
 kubectl apply -f ./servicemonitor/prometheus-sm.yml
-kubectl apply -f ./servicemonitor/pushgateway-sm.yml
 
 # 部署prometheus_adapter
 kubectl apply -f ./prometheus_adapter/metric_rule.yaml