Merge pull request #91 from ernestas-poskus/bump/prometheus_to_2_9_2

Bump prometheus to 2.9.2

Author: ernestas-poskus

README.md

@@ -62,7 +62,7 @@ prometheus_snmp_exporter_config_dir: "{{ prometheus_config_dir }}/snmpexporter"
 prometheus_blackbox_exporter_config_dir: "{{ prometheus_config_dir }}/blackboxexporter"
 
 # Prometheus
-prometheus_version: '2.5.0'
+prometheus_version: '2.9.2'
 prometheus_platform_architecture: 'linux-amd64'
 
 # Node exporter

defaults/main.yml

@@ -24,7 +24,7 @@ prometheus_snmp_exporter_config_dir: "{{ prometheus_config_dir }}/snmpexporter"
 prometheus_blackbox_exporter_config_dir: "{{ prometheus_config_dir }}/blackboxexporter"
 
 # Prometheus
-prometheus_version: '2.5.0'
+prometheus_version: '2.9.2'
 prometheus_platform_architecture: 'linux-amd64'
 
 # Node exporter
@@ -99,6 +99,9 @@ prometheus_config_remote_read:
 prometheus_config__file: "{{ prometheus_config_dir }}/prometheus.yml"
 # Prometheus configuration file name.
 
+prometheus_log__format: "logfmt"
+# Output format of log messages. One of: [logfmt, json]
+
 prometheus_web__listen_address: ":9090"
 # Address to listen on for the web interface, API, and telemetry.
 
@@ -108,6 +111,9 @@ prometheus_web__read_timeout: '30s'
 prometheus_web__max_connections: 512
 # Maximum number of simultaneous connections.
 
+prometheus_web__page_title:
+# Document title of Prometheus instance.
+
 prometheus_web__external_url:
 # The URL under which Prometheus is externally reachable (for
 # example, if Prometheus is served via a reverse proxy). Used for
@@ -126,6 +132,9 @@ prometheus_web__user_assets:
 prometheus_web__console__templates: 'consoles'
 # Path to the console template directory, available at /consoles.
 
+prometheus_web__cors__origin: ".*"
+# Regex for CORS origin. It is fully anchored. Eg. 'https?://(domain1|domain2)\.com'
+
 prometheus_web__console__libraries: 'console_libraries'
 # Path to the console library directory.
 
@@ -135,6 +144,15 @@ prometheus_storage__tsdb__path: "{{ prometheus_data_dir }}"
 prometheus_storage__tsdb__retention: '15d'
 # How long to retain samples in the storage.
 
+prometheus_storage__tsdb__retention__size:
+# [EXPERIMENTAL] Maximum number of bytes that can
+# be stored for blocks. Units supported: KB, MB,
+# GB, TB, PB. This flag is experimental and can
+# be changed in future releases.
+
+prometheus_storage__tsdb__retention__time: "{{ prometheus_storage__tsdb__retention }}"
+# How long to retain samples in the storage.
+
 prometheus_alertmanager__notification_queue_capacity: 10000
 # The capacity of the queue for pending alert manager notifications.
 

docs/prometheus.md

@@ -58,6 +58,9 @@ prometheus_config_remote_read:
 prometheus_config__file: "{{ prometheus_config_dir }}/prometheus.yml"
 # Prometheus configuration file name.
 
+prometheus_log__format: "logfmt"
+# Output format of log messages. One of: [logfmt, json]
+
 prometheus_web__listen_address: ":9090"
 # Address to listen on for the web interface, API, and telemetry.
 
@@ -67,6 +70,9 @@ prometheus_web__read_timeout: '30s'
 prometheus_web__max_connections: 512
 # Maximum number of simultaneous connections.
 
+prometheus_web__page_title:
+# Document title of Prometheus instance.
+
 prometheus_web__external_url:
 # The URL under which Prometheus is externally reachable (for
 # example, if Prometheus is served via a reverse proxy). Used for
@@ -85,6 +91,9 @@ prometheus_web__user_assets:
 prometheus_web__console__templates: 'consoles'
 # Path to the console template directory, available at /consoles.
 
+prometheus_web__cors__origin: ".*"
+# Regex for CORS origin. It is fully anchored. Eg. 'https?://(domain1|domain2)\.com'
+
 prometheus_web__console__libraries: 'console_libraries'
 # Path to the console library directory.
 
@@ -94,6 +103,15 @@ prometheus_storage__tsdb__path: "{{ prometheus_data_dir }}"
 prometheus_storage__tsdb__retention: '15d'
 # How long to retain samples in the storage.
 
+prometheus_storage__tsdb__retention__size:
+# [EXPERIMENTAL] Maximum number of bytes that can
+# be stored for blocks. Units supported: KB, MB,
+# GB, TB, PB. This flag is experimental and can
+# be changed in future releases.
+
+prometheus_storage__tsdb__retention__time: "{{ prometheus_storage__tsdb__retention }}"
+# How long to retain samples in the storage.
+
 prometheus_alertmanager__notification_queue_capacity: 10000
 # The capacity of the queue for pending alert manager notifications.
 

templates/prometheus.service.j2

@@ -15,6 +15,7 @@ User={{prometheus_owner}}
 Group={{prometheus_group}}
 StandardOutput=journal
 StandardError=journal
+WorkingDirectory={{ prometheus_install_dir }}/{{ prometheus_archive }}
 
 [Install]
 WantedBy=multi-user.target

vars/prometheus.yml

@@ -5,6 +5,7 @@ prometheus_service_config:
   - ['alertmanager.notification-queue-capacity', "{{ prometheus_alertmanager__notification_queue_capacity }}"]
   - ['alertmanager.timeout', "{{ prometheus_alertmanager__timeout }}"]
   - ['config.file', "{{ prometheus_config__file }}"]
+  - ['log.format', "{{ prometheus_log__format }}"]
   - ['log.level', "{{ prometheus_log__level }}"]
   - ['query.lookback-delta', "{{ prometheus_query__lookback_delta }}"]
   - ['query.max-concurrency', "{{ prometheus_query__max_concurrency }}"]
@@ -17,12 +18,15 @@ prometheus_service_config:
   - ['storage.remote.read-concurrent-limit', "{{ prometheus_storage__remote__read_concurrent_limit }}"]
   - ['storage.remote.read-sample-limit', "{{ prometheus_storage__remote__read_sample_limit }}"]
   - ['storage.tsdb.path', "{{ prometheus_storage__tsdb__path }}"]
-  - ['storage.tsdb.retention', "{{ prometheus_storage__tsdb__retention }}"]
+  - ['storage.tsdb.retention.size', "{{ prometheus_storage__tsdb__retention__size }}"]
+  - ['storage.tsdb.retention.time', "{{ prometheus_storage__tsdb__retention__time }}"]
   - ['web.console.libraries', "{{ prometheus_web__console__libraries }}"]
   - ['web.console.templates', "{{ prometheus_web__console__templates }}"]
+  - ['web.cors.origin', "{{ prometheus_web__cors__origin }}"]
   - ['web.external-url', "{{ prometheus_web__external_url }}"]
   - ['web.listen-address', "{{ prometheus_web__listen_address }}"]
   - ['web.max-connections', "{{ prometheus_web__max_connections }}"]
+  - ['web.page-title', "{{ prometheus_web__page_title }}"]
   - ['web.read-timeout', "{{ prometheus_web__read_timeout }}"]
   - ['web.route-prefix', "{{ prometheus_web__route_prefix }}"]
   - ['web.user-assets', "{{ prometheus_web__user_assets }}"]