Merge branch 'eleven' into twelve

Author: Mesaguy

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
+
 - New exporters:
   - dockerhub_exporter_promhippie
   - fping_exporter_schweikert
@@ -19,6 +20,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Upgrade redis_exporter_oliver006 from v1.5.2 to v1.5.3
+- Update metadata to include latest master commits
+
+## [0.11.4] - 2020-04-09
+
+### Changed
+
 - Upgrade Go from v1.13.9 to v1.13.10
 - Upgrade apache_exporter_lusitaniae from v0.7.0 to v0.8.0
 - Upgrade ntp_exporter_sapcc v1.1.1 to v1.1.2

README.md

@@ -48,10 +48,12 @@ See each exporter's usage page for more details:
 |-----------------------------------------------------------------------------------------------|:-----------------------------------------------------------:|:--------------------:|:---------:|
 |[389ds_exporter_terrycain](https://github.com/terrycain/389ds_exporter)                        | [usage](docs/389ds_exporter_terrycain.md)                   | terrycain            | Yes       |
 |[apache_exporter_lusitaniae](https://github.com/Lusitaniae/apache_exporter)                    | [usage](docs/apache_exporter_lusitaniae.md)                 | Lusitaniae           | Yes       |
+|[aerospike_exporter_alicebob](https://github.com/alicebob/asprom)                              | [usage](docs/aerospike_exporter_alicebob.md)                | alicebob             | Yes       |
 |[bigip_exporter_expressenab](https://github.com/ExpressenAB/bigip_exporter)                    | [usage](docs/bigip_exporter_expressenab.md)                 | ExpressenAB          | Yes       |
 |[bind_exporter_prometheus_community](https://github.com/prometheus-community/bind_exporter)    | [usage](docs/bind_exporter_prometheus_community.md)         | prometheus-community | Yes       |
 |[blackbox_exporter](https://github.com/prometheus/blackbox_exporter)                           | [usage](docs/blackbox_exporter.md)                          | prometheus           | Yes       |
 |[ceph_exporter](https://github.com/digitalocean/ceph_exporter)                                 | [usage](docs/ceph_exporter.md)                              | digitalocean         | Partly    |
+|[clickhouse_exporter_perconalab](https://github.com/Percona-Lab/clickhouse_exporter)           | [usage](docs/clickhouse_exporter_perconalab.md)             | perconalab           | Yes       |
 |[cloudwatch_exporter](https://github.com/prometheus/cloudwatch_exporter)                       | [usage](docs/cloudwatch_exporter.md)                        | prometheus           | Yes       |
 |[collectd_exporter](https://github.com/prometheus/collectd_exporter)                           | [usage](docs/collectd_exporter.md)                          | prometheus           | Yes       |
 |[consul_exporter](https://github.com/prometheus/consul_exporter)                               | [usage](docs/consul_exporter.md)                            | prometheus           | Yes       |
@@ -77,6 +79,7 @@ See each exporter's usage page for more details:
 |[nvidia_gpu_exporter_mindprince](https://github.com/mindprince/nvidia_gpu_prometheus_exporter) | [usage](docs/nvidia_gpu_exporter_mindprince.md)             | mindprince           | Yes       |
 |[openldap_exporter_tomcz](https://github.com/tomcz/openldap_exporter)                          | [usage](docs/openldap_exporter_tomcz.md)                    | tomcz                | Yes       |
 |[openvpn_exporter_kumina](https://github.com/kumina/openvpn_exporter)                          | [usage](docs/openvpn_exporter_kumina.md)                    | kumina               | Yes       |
+|[phpfpm_exporter_hipages](https://github.com/hipages/php-fpm_exporter)                         | [usage](docs/phpfpm_exporter_hipages.md)                    | hipages              | Yes       |
 |[ping_exporter_czerwonk](https://github.com/czerwonk/ping_exporter)                            | [usage](docs/ping_exporter_czerwonk.md)                     | czerwonk             | Yes       |
 |[postgres_exporter_wrouesnel](https://github.com/wrouesnel/postgres_exporter)                  | [usage](docs/postgres_exporter_wrouesnel.md)                | wrouesnel            | Yes       |
 |[powerdns_exporter_ledgr](https://github.com/ledgr/powerdns_exporter)                          | [usage](docs/powerdns_exporter_ledgr.md)                    | ledgr                | Partly    |

defaults/main.yml

@@ -58,6 +58,7 @@ prometheus_software_setup_pkg_mgrs:
  - 'Alpine'
  - 'Archlinux'
  - 'Gentoo'
+prometheus_default_url_unarchive: true
 
 # Base directories
 prometheus_etc_dir: '{{ prometheus_root_dir }}/etc'

docs/aerospike_exporter_alicebob.md

@@ -0,0 +1,20 @@
+# Aerospike exporter (alicebob) configuration
+
+To enable [aerospike_exporter by alicebob](https://github.com/alicebob/asprom) include role task: aerospike_exporter_alicebob
+
+An array of additional flags to pass to the aerospike_exporter daemon:
+
+    prometheus_aerospike_exporter_alicebob_extra_opts: []
+
+The version of aerospike_exporter_alicebob to install. The default version can be found in the [aerospike_exporter_alicebob variables file](../vars/software/aerospike_exporter_alicebob.yml) and the default version can be overridden using the following variable:
+
+    prometheus_aerospike_exporter_alicebob_version: "1.0.0"
+
+Allow the use of prerelease versions (beta, test, development, etc versions), defaults to 'false':
+
+    prometheus_aerospike_exporter_alicebob_use_prerelease: true
+
+Port and IP to listen on. Defaults to listening on all available IPs on port 9145:
+
+    prometheus_aerospike_exporter_alicebob_host: "0.0.0.0"
+    prometheus_aerospike_exporter_alicebob_port: 9145

docs/clickhouse_exporter_perconalab.md

@@ -0,0 +1,20 @@
+# Clickhouse exporter (Percona-Lab) configuration
+
+To enable [clickhouse_exporter by Percona-Lab](https://github.com/Percona-Lab/clickhouse_exporter) include role task: clickhouse_exporter_perconalab
+
+An array of additional flags to pass to the clickhouse_exporter daemon:
+
+    prometheus_clickhouse_exporter_perconalab_extra_opts: []
+
+The version of clickhouse_exporter_perconalab to install. The default version can be found in the [clickhouse_exporter_perconalab variables file](../vars/software/clickhouse_exporter_perconalab.yml) and the default version can be overridden using the following variable:
+
+    prometheus_clickhouse_exporter_perconalab_version: "1.0.0"
+
+Allow the use of prerelease versions (beta, test, development, etc versions), defaults to 'false':
+
+    prometheus_clickhouse_exporter_perconalab_use_prerelease: true
+
+Port and IP to listen on. Defaults to listening on all available IPs on port 9145:
+
+    prometheus_clickhouse_exporter_perconalab_host: "0.0.0.0"
+    prometheus_clickhouse_exporter_perconalab_port: 9363

docs/jmx_exporter.md

@@ -7,7 +7,7 @@ The [jmx_exporter](https://github.com/prometheus/jmx_exporter) is different from
 The configuration content. The example below utilizes a file named 'jmx_exporter.yml' in your Ansible root directory's 'files' directory. If no configuration content is defined, a default configuration file is utilized. You will want to customize your configuration file content!:
 
 ``` yaml
-prometheus_jmx_cfgs:
+prometheus_jmx_exporter_cfgs:
   elasticsearch: "{{ lookup('file', '../../files/prometheus/jmx.elasticsearch.yml') | from_yaml }}"
   puppet: "{{ lookup('file', '../../files/prometheus/jmx.puppet.yml') | from_yaml }}"
 ```

docs/mongodb_exporter_percona.md

@@ -5,8 +5,8 @@ To enable [mongodb_exporter by percona](https://github.com/percona/mongodb_expor
 Authentication can be configured using a YAML file or environmental variables using the following syntax:
 
     prometheus_mongodb_exporter_percona_env_vars:
-      MONGODB_URI='mongodb://localhost:27017'
-      HTTP_AUTH='user:password'
+      MONGODB_URI: 'mongodb://mongouser:mongopassword@localhost:27017/authdatabase'
+      HTTP_AUTH: 'user:password'
 
 An array of additional flags to pass to the mongodb_exporter daemon:
 

docs/phpfpm_exporter_hipages.md

@@ -0,0 +1,20 @@
+# PHP-FPM exporter (hipages) configuration
+
+To enable [phpfpm_exporter by hipages](https://github.com/hipages/php-fpm_exporter) include role task: phpfpm_exporter_hipages
+
+An array of additional flags to pass to the phpfpm_exporter daemon:
+
+    prometheus_phpfpm_exporter_hipages_extra_opts: []
+
+The version of phpfpm_exporter_hipages to install. The default version can be found in the [phpfpm_exporter_hipages variables file](../vars/software/phpfpm_exporter_hipages.yml) and the default version can be overridden using the following variable:
+
+    prometheus_phpfpm_exporter_hipages_version: "1.0.0"
+
+Allow the use of prerelease versions (beta, test, development, etc versions), defaults to 'false':
+
+    prometheus_phpfpm_exporter_hipages_use_prerelease: true
+
+Port and IP to listen on. Defaults to listening on all available IPs on port 9145:
+
+    prometheus_phpfpm_exporter_hipages_host: "0.0.0.0"
+    prometheus_phpfpm_exporter_hipages_port: 9253

docs/statsd_exporter.md

@@ -2,25 +2,33 @@
 
 To enable [statsd_exporter](https://github.com/prometheus/statsd_exporter) include role task: statsd_exporter
 
-The configuration content. The example below utilizes a file named 'statsd_exporter.yml' in your Ansible root directory's 'files' directory. If no configuration content is defined, a default configuration file is utilized. You will want to customize your configuration file content!:
+An array of additional flags to pass to the statsd_exporter daemon:
+
+    prometheus_statsd_exporter_extra_opts:
+      - --statsd.listen-udp=":9125"
+      - "--statsd.mapping-config={{prometheus_etc_dir}}/statsd_exporter.yml"
+
+The configuration content. The example below utilizes a file named 'statsd_exporter.yml' in your Ansible root directory's 'files' directory. If no configuration content is defined, a default configuration is utilized. To use specified config `"--statsd.mapping-config={{prometheus_etc_dir}}/statsd_exporter.yml"` should be added to `prometheus_statsd_exporter_extra_opts`. You will want to customize your configuration file content!:
 
     prometheus_statsd_exporter_cfg: '{{ lookup("file", "../files/statsd_exporter.yml") | from_yaml }}'
 
 Alternatively, the configuration file can be defined directly:
 
     prometheus_statsd_exporter_cfg:
-      - match: test.dispatcher.*.*.*
-        name: dispatcher_events_total
-        labels:
-          action: $2
-          job: test_dispatcher
-          outcome: $3
-          processor: $1
-
-An array of additional flags to pass to the statsd_exporter daemon:
-
-    prometheus_statsd_exporter_extra_opts:
-        --statsd.listen-udp=":9125"
+      defaults:
+        quantiles:
+          - quantile: 0.99
+            error: 0.001
+          - quantile: 0.5
+            error: 0.05
+      mappings:
+        - match: test.dispatcher.*.*.*
+          name: dispatcher_events_total
+          labels:
+            action: $2
+            job: test_dispatcher
+            outcome: $3
+            processor: $1
 
 The version of statsd_exporter to install. The default version can be found in the [statsd_exporter variables file](../vars/software/statsd_exporter.yml) and the default version can be overridden using the following variable:
 

tasks/_install_from_binary.yml

@@ -81,6 +81,7 @@
     - not prometheus_software_installed.stat.exists
     - prometheus_software_download is succeeded
     - prometheus_software_archive_file | regex_search('.*(tar.gz)$', ignorecase=True)
+    - prometheus_software_url_unarchive
 
 - name: 'Unarchive {{ prometheus_software_name_version }} ({{ prometheus_software_archive_file }})'
   become: true
@@ -100,6 +101,25 @@
   when:
     - not prometheus_software_installed.stat.exists
     - prometheus_software_download is succeeded
+    - prometheus_software_url_unarchive
+
+- name: 'Copy {{ prometheus_software_name_version }} ({{ prometheus_software_archive_file }})'
+  become: true
+  copy:
+    owner: root
+    group: '{{ prometheus_group }}'
+    src: '{{ prometheus_software_archive_file }}'
+    dest: '{{ prometheus_software_install_dir }}/{{ prometheus_software_binary_name }}'
+    remote_src: true
+  # Handled downstream:
+  ignore_errors: '{{ prometheus_software_fallback_to_build | bool }}'
+  register: prometheus_software_installation
+  notify:
+    - Restart Prometheus service
+  when:
+    - not prometheus_software_installed.stat.exists
+    - prometheus_software_download is succeeded
+    - not prometheus_software_url_unarchive
 
 - name: Remove {{ prometheus_software_name_version }} archive file
   become: true