From ec14daa12156d003d8744edf6f2849a6308c9255 Mon Sep 17 00:00:00 2001
From: frezes <zhangjunhao@kubesphere.io>
Date: Mon, 20 Jun 2022 11:09:43 +0800
Subject: [PATCH] Adjust ks-istio-monitoring to ensure monitoring files are
 installed

Signed-off-by: frezes <zhangjunhao@kubesphere.io>
---
 roles/ks-istio/files/prometheus/readme.md     | 19 -------------------
 roles/ks-istio/tasks/main.yaml                | 11 -----------
 .../prometheus-operator.yaml                  |  0
 .../ks-monitor/tasks/ks-istio-monitoring.yaml | 11 +++++++++++
 roles/ks-monitor/tasks/main.yaml              |  4 ++++
 5 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 roles/ks-istio/files/prometheus/readme.md
 rename roles/{ks-istio/files/prometheus => ks-monitor/files/ks-istio-monitoring}/prometheus-operator.yaml (100%)
 create mode 100644 roles/ks-monitor/tasks/ks-istio-monitoring.yaml

diff --git a/roles/ks-istio/files/prometheus/readme.md b/roles/ks-istio/files/prometheus/readme.md
deleted file mode 100644
index 7cc6ee27f..000000000
--- a/roles/ks-istio/files/prometheus/readme.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# delete additional-scrape-configs secret firstly
-
-```bash
-kubectl -n kubesphere-monitoring-system delete secret additional-scrape-configs
-```
-
-# create additional-scrape-configs secret from prometheus file
-
-```bash
-kubectl -n kubesphere-monitoring-system create secret generic additional-scrape-configs --from-file=prometheus-additional.yaml
-```
-
-# The secrets should be modified both in two places:
-
-1. roles/ks-istio/files/prometheus/prometheus-additional.yaml
-
-2. keep roles/ks-monitor/files/prometheus/prometheus/additional-scrape-configs.yaml
-
-`kubectl get secrets additional-scrape-configs -n kubesphere-monitoring-system`
diff --git a/roles/ks-istio/tasks/main.yaml b/roles/ks-istio/tasks/main.yaml
index 0043210e4..2a0da62bd 100644
--- a/roles/ks-istio/tasks/main.yaml
+++ b/roles/ks-istio/tasks/main.yaml
@@ -7,7 +7,6 @@
     - "istio"
     - "kiali"
     - "jaeger"
-    - "prometheus"
 
 - name: servicemesh | Unarchive istio files
   shell: >
@@ -81,16 +80,6 @@
 
 - import_tasks: kiali-install.yaml
 
-# create prometheus config by PodMonitor and SerivceMonitor CR
-# wait until PodMonitor kind created.
-- name: servicemesh | Creating prometheus config
-  shell: >
-    {{ bin_dir }}/kubectl apply -f {{ kubesphere_dir }}/servicemesh/prometheus/prometheus-operator.yaml
-  register: prom_result
-  failed_when: false
-  until: prom_result is succeeded
-  retries: 5
-  delay: 5
 
 - name: servicemesh | set servicemesh status enabled
   shell: >
diff --git a/roles/ks-istio/files/prometheus/prometheus-operator.yaml b/roles/ks-monitor/files/ks-istio-monitoring/prometheus-operator.yaml
similarity index 100%
rename from roles/ks-istio/files/prometheus/prometheus-operator.yaml
rename to roles/ks-monitor/files/ks-istio-monitoring/prometheus-operator.yaml
diff --git a/roles/ks-monitor/tasks/ks-istio-monitoring.yaml b/roles/ks-monitor/tasks/ks-istio-monitoring.yaml
new file mode 100644
index 000000000..de3f4937d
--- /dev/null
+++ b/roles/ks-monitor/tasks/ks-istio-monitoring.yaml
@@ -0,0 +1,11 @@
+---
+- name: Monitoring | Getting ks-istio monitoring installation files
+  copy:
+    src: "{{ item }}"
+    dest: "{{ kubesphere_dir }}/"
+  loop:
+    - "ks-istio-monitoring"
+
+- name: Monitoring | Installing ks-istio monitoring
+  shell: >
+    {{ bin_dir }}/kubectl apply -f {{ kubesphere_dir }}/ks-istio-monitoring --force
diff --git a/roles/ks-monitor/tasks/main.yaml b/roles/ks-monitor/tasks/main.yaml
index 5e51fef16..b8c767c27 100644
--- a/roles/ks-monitor/tasks/main.yaml
+++ b/roles/ks-monitor/tasks/main.yaml
@@ -6,6 +6,10 @@
   when:
     - "status.monitoring is not defined or status.monitoring.status is not defined or status.monitoring.status != 'enabled'"
 
+- import_tasks: ks-istio-monitoring.yaml
+  when:
+    - "servicemesh.enabled is defined and servicemesh.enabled"
+
 - import_tasks: gpu-monitoring.yaml
   when:
     - "status.monitoring is not defined or status.monitoring.status is not defined or status.monitoring.status != 'enabled'"