Remove grafana collector (#892)

* Remove grafana collector

* Remove extra file

deploy.yml

@@ -86,7 +86,6 @@
     - grafana
   roles:
     - grafana
-    - grafana_collector
 
 - name: deploying kafka_exporter
   hosts: kafka_exporter_servers

graceful_stop.yml

@@ -343,21 +343,3 @@
         port: "{{ grafana_port }}"
         state: stopped
         msg: "the grafana port {{ grafana_port }} is not down"
-
-    - name: stop grafana_collector by supervise
-      shell: cd {{ deploy_dir }}/scripts && ./stop_{{ item }}.sh
-      when: process_supervision == 'supervise'
-      with_items:
-        - grafana_collector
-
-    - name: stop grafana_collector by systemd
-      systemd: name=grafana_collector-{{ grafana_collector_port }}.service state=stopped
-      become: true
-      when: process_supervision == 'systemd'
-
-    - name: wait until the grafana_collector port is down
-      wait_for:
-        host: "{{ ansible_host }}"
-        port: "{{ grafana_collector_port }}"
-        state: stopped
-        msg: "the grafana_collector port {{ grafana_collector_port }} is not down"

group_vars/grafana_servers.yml

@@ -1,6 +1,5 @@
 ---
 
 grafana_port: 3000
-grafana_collector_port: 8686
 
 grafana_api_keys_dir: "{{ playbook_dir }}/conf/keys"

migrate_monitor.yml

@@ -262,7 +262,6 @@
 
   roles:
     - grafana
-    - grafana_collector
 
   post_tasks:
     - name: start grafana by supervise
@@ -281,21 +280,6 @@
         host={{ ansible_host }} port={{ grafana_port }} state=present
         send='GET /login HTTP/1.0\r\n\r\n' search_regex='200 OK'
 
-    - name: start grafana_collector by supervise
-      shell: cd {{ deploy_dir }}/scripts && ./start_{{ item }}.sh
-      when: process_supervision == 'supervise'
-      with_items:
-        - grafana_collector
-
-    - name: start grafana_collector by systemd
-      systemd: name=grafana_collector-{{ grafana_collector_port }}.service state=started enabled=no
-      when: process_supervision == 'systemd'
-      become: true
-
-    - name: wait for grafana_collector up
-      wait_for: |
-        host={{ ansible_host }} port={{ grafana_collector_port }} state=present
-
     - set_fact:
         grafana_host: "{{ ansible_host }}"
 
@@ -317,7 +301,6 @@
         - grafana_dest_config:
             name: "{{ cluster_name | title }}"
             url: "http://{{ grafana_host }}:{{ grafana_port }}/"
-            report_url: "http://{{ grafana_host }}:{{ grafana_collector_port }}/"
             user: "{{ grafana_admin_user }}"
             password: "{{ grafana_admin_password }}"
             apikey: "{{ lookup('file', grafana_api_keys_dir + '/grafana_apikey.key') }}"

roles/local/tasks/main.yml

@@ -178,10 +178,6 @@
   with_items:
     - fio
 
-- name: cp grafana_collector binary and fonts
-  shell: >
-    cp -rv {{ downloads_dir }}/grafana_collector-latest-linux-amd64/* "{{ resources_dir }}/bin/"
-
 - name: cp kafka_exporter binary
   shell: >
     cp -v {{ downloads_dir }}/kafka_exporter-*/{{ item }} "{{ resources_dir }}/bin/"

roles/local/templates/common_packages.yml.j2

@@ -15,9 +15,6 @@ common_packages:
     version: 3.8
     url: "http://download.pingcap.org/fio-3.8.tar.gz"
     checksum: "sha256:15739abde7e74b59ac59df57f129b14fc5cd59e1e2eca2ce37b41f8c289c3d58"
-  - name: grafana_collector
-    version: latest
-    url: http://download.pingcap.org/grafana_collector-latest-linux-amd64.tar.gz
   - name: kafka_exporter
     version: 1.1.0
     url: http://download.pingcap.org/kafka_exporter-1.1.0.linux-amd64.tar.gz

rolling_update_monitor.yml

@@ -351,36 +351,8 @@
         state: stopped
         msg: "the grafana port {{ grafana_port }} is not down"
 
-    - name: check grafana_collector existed
-      stat:
-        path: "{{ deploy_dir }}/conf/grafana_collector.toml"
-      register: grafana_collector_config_file
-
-    - name: stop grafana_collector by supervise
-      shell: cd {{ deploy_dir }}/scripts && ./stop_{{ item }}.sh
-      when:
-        - process_supervision == 'supervise'
-        - grafana_collector_config_file.stat.exists == True
-      with_items:
-        - grafana_collector
-
-    - name: stop grafana_collector by systemd
-      systemd: name=grafana_collector-{{ grafana_collector_port }}.service state=stopped
-      become: true
-      when:
-        - process_supervision == 'systemd'
-        - grafana_collector_config_file.stat.exists == True
-
-    - name: wait until the grafana_collector port is down
-      wait_for:
-        host: "{{ ansible_host }}"
-        port: "{{ grafana_collector_port }}"
-        state: stopped
-        msg: "the grafana_collector port {{ grafana_collector_port }} is not down"
-
   roles:
     - grafana
-    - grafana_collector
 
   post_tasks:
     - name: start grafana by supervise
@@ -409,24 +381,6 @@
       retries: 12
       delay: 5
 
-    - name: start grafana_collector by supervise
-      shell: cd {{ deploy_dir }}/scripts && ./start_{{ item }}.sh
-      when: process_supervision == 'supervise'
-      with_items:
-        - grafana_collector
-
-    - name: start grafana_collector by systemd
-      systemd: name=grafana_collector-{{ grafana_collector_port }}.service state=started enabled=no
-      when: process_supervision == 'systemd'
-      become: true
-
-    - name: wait until the grafana_collector port is up
-      wait_for:
-        host: "{{ ansible_host }}"
-        port: "{{ grafana_collector_port }}"
-        state: started
-        msg: "the grafana_collector port {{ grafana_collector_port }} is not up"
-
     - set_fact:
         grafana_host: "{{ ansible_host }}"
 
@@ -448,7 +402,6 @@
         - grafana_dest_config:
             name: "{{ cluster_name | title }}"
             url: "http://{{ grafana_host }}:{{ grafana_port }}/"
-            report_url: "http://{{ grafana_host }}:{{ grafana_collector_port }}/"
             user: "{{ grafana_admin_user }}"
             password: "{{ grafana_admin_password }}"
             apikey: "{{ lookup('file', grafana_api_keys_dir + '/grafana_apikey.key') }}"