Merge pull request #1 from cloudalchemy/superq/auth

Add DATA_SOURCE_NAME auth support.

Author: SuperQ

defaults/main.yml

@@ -1,7 +1,9 @@
 ---
-mysqld_exporter_version: 0.16.0
+mysqld_exporter_version: 0.11.0
 mysqld_exporter_web_listen_address: "0.0.0.0:9104"
 
+mysqld_exporter_dsn: "exporter:password@(localhost:3306)/"
+
 mysqld_exporter_my_cnf: ""
 
 mysqld_exporter_collect: []

molecule/default/molecule.yml

@@ -9,31 +9,37 @@ platforms:
   - name: bionic
     image: paulfantom/ubuntu-molecule:18.04
     privileged: true
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: xenial
     image: paulfantom/ubuntu-molecule:16.04
     privileged: true
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: stretch
     image: paulfantom/debian-molecule:9
     privileged: true
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: jessie
     image: paulfantom/debian-molecule:8
     privileged: true
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: centos7
     image: paulfantom/centos-molecule:7
     privileged: true
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
   - name: fedora
     image: paulfantom/fedora-molecule:27
     privileged: true
+    docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
 provisioner:

molecule/default/playbook.yml

@@ -4,4 +4,5 @@
   roles:
     - ansible-mysqld-exporter
   vars:
+    mysqld_exporter_dsn: "root@(localhost:3306)/"
     mysqld_exporter_web_listen_address: "127.0.0.1:9104"

molecule/default/prepare.yml

@@ -2,15 +2,26 @@
 - name: Prepare
   hosts: all
   tasks:
+  - name: Gather variables for each operating system
+    debug:
+      var: ansible_distribution_release
   - name: Install mysqld server
     package:
       name: "{{ mysql_package }}"
       state: present
   - name: Start mysql server
     systemd:
       name: "{{ mysql_service }}"
+      enabled: true
       state: started
   vars:
-    mysql_package: "{{ 'mariadb' if (ansible_os_family | lower) == 'redhat' else 'mariadb-server' }}"
-    mysql_service: mysqld
-
+    mysql_service_map:
+      CentOS:
+        Core: "mariadb"
+      Debian:
+        stretch: "mysqld"
+      Fedora:
+        Twenty Eight: "mariadb"
+      Ubuntu:
+    mysql_package: "mariadb-server"
+    mysql_service: "{{ mysql_service_map[ansible_distribution][ansible_distribution_release] | default('mysql') }}"

tasks/main.yml

@@ -1,13 +1,13 @@
 ---
 - include: preflight.yml
 
-- name: Create the Node Exporter group
+- name: Create the MySQL Exporter group
   group:
     name: "{{ __mysqld_exporter_group }}"
     state: present
     system: true
 
-- name: Create the Node Exporter user
+- name: Create the MySQL Exporter user
   user:
     name: "{{ __mysqld_exporter_user }}"
     groups: "{{ __mysqld_exporter_group }}"
@@ -43,7 +43,7 @@
   copy:
     src: "/tmp/mysqld_exporter-{{ mysqld_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/mysqld_exporter"
     dest: "/usr/local/bin/mysqld_exporter"
-    mode: 0750
+    mode: 0755
     owner: root
     group: root
   notify:

templates/mysqld_exporter.service.j2

@@ -6,6 +6,9 @@ After=network.target
 Type=simple
 User={{ __mysqld_exporter_user }}
 Group={{ __mysqld_exporter_group }}
+{% if mysqld_exporter_dsn != "" %}
+Environment="DATA_SOURCE_NAME={{ mysqld_exporter_dsn }}"
+{% endif %}
 ExecStart=/usr/local/bin/mysqld_exporter \
     --web.listen-address {{ mysqld_exporter_web_listen_address }} \
     {% for c in mysqld_exporter_collect -%}