diff --git a/roles/adc_exporter/files/freeipmi-1.5.7-3.el7.x86_64.rpm b/roles/adc_exporter/files/freeipmi-1.5.7-3.el7.x86_64.rpm new file mode 100644 index 0000000..17c5b2d Binary files /dev/null and b/roles/adc_exporter/files/freeipmi-1.5.7-3.el7.x86_64.rpm differ diff --git a/roles/adc_exporter/files/ipmi_exporter b/roles/adc_exporter/files/ipmi_exporter new file mode 100755 index 0000000..f57b94a Binary files /dev/null and b/roles/adc_exporter/files/ipmi_exporter differ diff --git a/roles/adc_exporter/tasks/main.yml b/roles/adc_exporter/tasks/main.yml index ed9a9f6..be161a8 100644 --- a/roles/adc_exporter/tasks/main.yml +++ b/roles/adc_exporter/tasks/main.yml @@ -1,3 +1,14 @@ +- name: "copy freeipmi tools" + copy: + src: '{{ role_path }}/files/freeipmi-1.5.7-3.el7.x86_64.rpm' + dest: /tmp/ansible_deploy/freeipmi-1.5.7-3.el7.x86_64.rpm + +- name: "Install freeipmi rpm package" + yum: + name: + - "/tmp/ansible_deploy/freeipmi-1.5.7-3.el7.x86_64.rpm" + state: present + - name: "mkdir /opt/adc-exporter/" file: path: /opt/adc-exporter/ @@ -15,6 +26,12 @@ dest: /opt/adc-exporter/systemd_exporter mode: 0755 +- name: "copy ipmi_exporter" + copy: + src: '{{ role_path }}/files/ipmi_exporter' + dest: /opt/adc-exporter/ipmi_exporter + mode: 0755 + - name: "templates adc-exporter-node.service" template: src: "{{role_path}}/templates/adc-exporter-node.service.j2" @@ -27,6 +44,12 @@ dest: /usr/lib/systemd/system/adc-exporter-systemd.service tags: template +- name: "templates adc-exporter-ipmi.service" + template: + src: "{{role_path}}/templates/adc-exporter-ipmi.service.j2" + dest: /usr/lib/systemd/system/adc-exporter-ipmi.service + tags: template + - name: 'adc-exporter-node service start' systemd: name: adc-exporter-node @@ -40,3 +63,10 @@ enabled: yes daemon_reload: yes state: started + +- name: 'adc-exporter-ipmi service start' + systemd: + name: adc-exporter-ipmi + enabled: yes + daemon_reload: yes + state: started diff --git a/roles/adc_exporter/templates/adc-exporter-ipmi.service.j2 b/roles/adc_exporter/templates/adc-exporter-ipmi.service.j2 new file mode 100644 index 0000000..c9eeb3d --- /dev/null +++ b/roles/adc_exporter/templates/adc-exporter-ipmi.service.j2 @@ -0,0 +1,11 @@ +[Unit] +Description=IPMI Exporter +After=network.target + +[Service] +Type=simple +ExecStart=/opt/adc-exporter/ipmi_exporter +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/roles/adc_exporter/templates/nginx.conf.j2 b/roles/adc_exporter/templates/nginx.conf.j2 deleted file mode 100644 index 711470d..0000000 --- a/roles/adc_exporter/templates/nginx.conf.j2 +++ /dev/null @@ -1,73 +0,0 @@ - -user nobody; -worker_processes 1; -daemon off; - -error_log logs/error.log; -error_log logs/error.log notice; -error_log logs/error.log info; -pid logs/nginx.pid; - - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - #access_log logs/access.log main; - - sendfile on; - tcp_nopush on; - - keepalive_timeout 65; - gzip on; - - server { - listen 9000; - server_name localhost; - access_log /var/log/nginx/host.access.log main; - - location /metrics/blade/mcn0/node_exporter { - proxy_pass http://192.168.100.1:9100/metrics; - } - - location /metrics/blade/mcn1/node_exporter { - proxy_pass http://192.168.100.2:9100/metrics; - } - - location /metrics/blade/mcn2/node_exporter { - proxy_pass http://192.168.100.3:9100/metrics; - } - - location /metrics/blade/mcn3/node_exporter { - proxy_pass http://192.168.100.4:9100/metrics; - } - - location /metrics/blade/mxn/node_exporter { - proxy_pass http://192.168.100.5:9100/metrics; - } - - location /metrics/blade/mcn0/systemd_exporter { - proxy_pass http://192.168.100.1:9558/metrics; - } - - location /metrics/blade/mcn1/systemd_exporter { - proxy_pass http://192.168.100.2:9558/metrics; - } - - location /metrics/blade/mcn2/systemd_exporter { - proxy_pass http://192.168.100.3:9558/metrics; - } - - location /metrics/blade/mcn3/systemd_exporter { - proxy_pass http://192.168.100.4:9558/metrics; - } - } -} diff --git a/roles/adc_exporter_proxy/tasks/main.yml b/roles/adc_exporter_proxy/tasks/main.yml index f59d498..78582fc 100644 --- a/roles/adc_exporter_proxy/tasks/main.yml +++ b/roles/adc_exporter_proxy/tasks/main.yml @@ -31,4 +31,4 @@ name: adc-exporter-proxy enabled: yes daemon_reload: yes - state: started + state: restarted diff --git a/roles/adc_exporter_proxy/templates/nginx.conf.j2 b/roles/adc_exporter_proxy/templates/nginx.conf.j2 index 3ae5a73..53cc147 100644 --- a/roles/adc_exporter_proxy/templates/nginx.conf.j2 +++ b/roles/adc_exporter_proxy/templates/nginx.conf.j2 @@ -69,6 +69,26 @@ http { proxy_pass http://192.168.100.4:9558/metrics; } + location /metrics/blade/mcn0/ipmi_exporter { + proxy_pass http://192.168.100.1:9290/metrics; + } + + location /metrics/blade/mcn1/ipmi_exporter { + proxy_pass http://192.168.100.2:9290/metrics; + } + + location /metrics/blade/mcn2/ipmi_exporter { + proxy_pass http://192.168.100.3:9290/metrics; + } + + location /metrics/blade/mcn3/ipmi_exporter { + proxy_pass http://192.168.100.4:9290/metrics; + } + + location /metrics/blade/mxn/ipmi_exporter { + proxy_pass http://192.168.100.5:9290/metrics; + } + location /metrics/blade/mcn0/certstore { proxy_pass http://192.168.100.1:9002/metrics; } diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml index 7a8cda9..1c97fea 100644 --- a/roles/mrzcpd/tasks/main.yml +++ b/roles/mrzcpd/tasks/main.yml @@ -148,13 +148,13 @@ - name: "enable prometheus output - monit_device" systemd: name: mrapm_device - enable: yes + enabled: yes daemon_reload: yes - name: "enable prometheus output - monit_stream" systemd: name: mrapm_stream - enable: yes + enabled: yes daemon_reload: yes - name: "enable mrtunnat on master"