Merge pull request #547 from pingcap/instance

scripts: templating job labels
pingcap · Sep 27, 2018 · 382cc5a · 382cc5a
2 parents b1053c9 + e3989e6
commit 382cc5a
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 10,994 deletions.
diff --git a/migrate_monitor.yml b/migrate_monitor.yml
@@ -327,7 +327,6 @@
               pd:   "{{ cluster_name | title }}-PD"
               tidb: "{{ cluster_name | title }}-TiDB"
               tikv: "{{ cluster_name | title }}-TiKV"
-              tikv_instances: "{{ cluster_name | title }}-TiKV-Instances"
               binlog: "{{ cluster_name | title }}-Binlog"
               overview: "{{ cluster_name | title }}-Overview"
               disk_performance: "{{ cluster_name | title }}-Disk-Performance"

diff --git a/rolling_update_monitor.yml b/rolling_update_monitor.yml
@@ -140,14 +140,14 @@
     - name: stop alertmanager by supervise
       shell: cd {{ deploy_dir }}/scripts && ./stop_alertmanager.sh
       when:
-        - process_supervision == 'supervise' 
+        - process_supervision == 'supervise'
         - alertmanager_configure_file.stat.exists == True
 
     - name: stop alertmanager by systemd
       systemd: name=alertmanager-{{ alertmanager_port }}.service state=stopped
       become: true
       when:
-        - process_supervision == 'systemd' 
+        - process_supervision == 'systemd'
         - alertmanager_configure_file.stat.exists == True
 
     - name: wait for alertmanager down
@@ -292,7 +292,7 @@
     - name: stop grafana_collector by supervise
       shell: cd {{ deploy_dir }}/scripts && ./stop_{{ item }}.sh
       when:
-        - process_supervision == 'supervise'   
+        - process_supervision == 'supervise'
         - grafana_collector_config_file.stat.exists == True
       with_items:
         - grafana_collector
@@ -301,7 +301,7 @@
       systemd: name=grafana_collector-{{ grafana_collector_port }}.service state=stopped
       become: true
       when:
-        - process_supervision == 'systemd' 
+        - process_supervision == 'systemd'
         - grafana_collector_config_file.stat.exists == True
 
     - name: wait for grafana_collector down
@@ -374,7 +374,6 @@
               pd:   "{{ cluster_name | title }}-PD"
               tidb: "{{ cluster_name | title }}-TiDB"
               tikv: "{{ cluster_name | title }}-TiKV"
-              tikv_instances: "{{ cluster_name | title }}-TiKV-Instances"
               binlog: "{{ cluster_name | title }}-Binlog"
               overview: "{{ cluster_name | title }}-Overview"
               disk_performance: "{{ cluster_name | title }}-Disk-Performance"

diff --git a/scripts/grafana-config-copy.py b/scripts/grafana-config-copy.py
@@ -24,7 +24,6 @@
                 "pd"  : 'pd.json',
                 "tidb": 'tidb.json',
                 "tikv": 'tikv.json',
-                "tikv_instances": "tikv_instances.json",
                 "binlog": "binlog.json",
                 "overview": 'overview.json',
                 "disk_performance": 'disk_performance.json',