Update prometheus job properties

Author: frodenas

ci/release_notes.md

@@ -3,6 +3,7 @@
 ### Breaking changes
 
 * The grafana password must be explicitelly set (it does not default to `admin` anymore)
+* Prometheus properties `prometheus.storage.remote.graphite*`, `prometheus.storage.remote.influxdb*` and `prometheus.storage.remote.opentsdb*` have been removed in favor of the new `prometheus.remote_write` configuration.
 
 ### Fixes
 

jobs/prometheus/spec

@@ -37,8 +37,12 @@ properties:
     description: "Array of paths to Prometheus rule files"
   prometheus.scrape_configs:
     description: "Array of scrape configurations"
+  prometheus.alerting:
+    description: "Alerting configuration"
   prometheus.remote_write:
-    description: "Remote storage configuration"
+    description: "Remote write storage configuration"
+  prometheus.remote_read:
+    description: "Remote read storage configuration"
 
   prometheus.alertmanager.notification_queue_capacity:
     description: "The capacity of the queue for pending alert manager notifications"
@@ -70,10 +74,6 @@ properties:
     description: "The size in bytes for the label name to label values index cache"
   prometheus.storage.local.index_cache_size.label_pair_to_fingerprints:
     description: "The size in bytes for the label pair to fingerprints index cache"
-  prometheus.storage.local.max_chunks_to_persist:
-    description: "How many chunks can be waiting for persistence before sample ingestion will be throttled "
-  prometheus.storage.local.memory_chunks:
-    description: "How many chunks to keep in memory"
   prometheus.storage.local.num_fingerprint_mutexes:
     description: "The number of mutexes used for fingerprint locking"
   prometheus.storage.local.pedantic_checks:
@@ -84,26 +84,8 @@ properties:
     description: "If 0 or smaller, truncation will be performed even for a single dropped chunk, while 1 or larger will effectively prevent any truncation"
   prometheus.storage.local.series_sync_strategy:
     description: "When to sync series files after modification"
-  prometheus.storage.remote.graphite.address:
-    description: "The host:port of the remote Graphite server to send samples to. None, if empty"
-  prometheus.storage.remote.graphite.prefix:
-    description: "The prefix to prepend to all metrics exported to Graphite. None, if empty"
-  prometheus.storage.remote.graphite.transport:
-    description: "Transport protocol to use to communicate with Graphite"
-  prometheus.storage.remote.influxdb.url:
-    description: "The URL of the remote InfluxDB server to send samples to. None, if empty"
-  prometheus.storage.remote.influxdb.database:
-    description: "The name of the database to use for storing samples in InfluxDB"
-  prometheus.storage.remote.influxdb.retention_policy:
-    description: "The InfluxDB retention policy to use"
-  prometheus.storage.remote.influxdb.username:
-    description: "The username to use when sending samples to InfluxDB"
-  prometheus.storage.remote.influxdb.password:
-    description: "The password to use when sending samples to InfluxDB"
-  prometheus.storage.remote.opentsdb.url:
-    description: "The URL of the remote OpenTSDB server to send samples to. None, if empty"
-  prometheus.storage.remote.timeout:
-    description: "The timeout to use when sending samples to the remote storage"
+  prometheus.storage.local.target_heap_size:
+    description: "The metrics storage attempts to limit its own memory usage such that the total heap size approaches this value"
 
   prometheus.web.console.libraries:
     description: "Path to the console library directory"

jobs/prometheus/templates/bin/prometheus_ctl

@@ -21,10 +21,6 @@ case $1 in
 
     ulimit -n 65536
 
-    <% if_p('prometheus.storage.remote.influxdb.password') do |influxdb_password| %> \
-    export INFLUXDB_PW="<%= influxdb_password %>"
-    <% end %> \
-
     exec prometheus \
       -config.file=/var/vcap/jobs/prometheus/config/prometheus.yml \
       <% if_p('prometheus.alertmanager.notification_queue_capacity') do |notification_queue_capacity| %> \
@@ -78,12 +74,6 @@ case $1 in
       <% if_p('prometheus.storage.local.index_cache_size.label_pair_to_fingerprints') do |label_pair_to_fingerprints| %> \
       -storage.local.index-cache-size.label-pair-to-fingerprints="<%= label_pair_to_fingerprints %>" \
       <% end %> \
-      <% if_p('prometheus.storage.local.max_chunks_to_persist') do |max_chunks_to_persist| %> \
-      -storage.local.max-chunks-to-persist="<%= max_chunks_to_persist %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.local.memory_chunks') do |memory_chunks| %> \
-      -storage.local.memory-chunks="<%= memory_chunks %>" \
-      <% end %> \
       <% if_p('prometheus.storage.local.num_fingerprint_mutexes') do |num_fingerprint_mutexes| %> \
       -storage.local.num-fingerprint-mutexes="<%= num_fingerprint_mutexes %>" \
       <% end %> \
@@ -100,32 +90,8 @@ case $1 in
       <% if_p('prometheus.storage.local.series_sync_strategy') do |series_sync_strategy| %> \
       -storage.local.series-sync-strategy="<%= series_sync_strategy %>" \
       <% end %> \
-      <% if_p('prometheus.storage.remote.graphite.address') do |graphite_address| %> \
-      -storage.remote.graphite-address="<%= graphite_address %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.graphite.prefix') do |graphite_prefix| %> \
-      -storage.remote.graphite-prefix="<%= graphite_prefix %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.graphite.transport') do |graphite_transport| %> \
-      -storage.remote.graphite-transport="<%= graphite_transport %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.influxdb.url') do |influxdb_url| %> \
-      -storage.remote.influxdb-url="<%= influxdb_url %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.influxdb.database') do |influxdb_database| %> \
-      -storage.remote.influxdb.database="<%= influxdb_database %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.influxdb.retention_policy') do |influxdb_retention_policy| %> \
-      -storage.remote.influxdb.retention-policy="<%= influxdb_retention_policy %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.influxdb.username') do |influxdb_username| %> \
-      -storage.remote.influxdb.username="<%= influxdb_username %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.opentsdb.url') do |opentsdb_url| %> \
-      -storage.remote.opentsdb-url="<%= opentsdb_url %>" \
-      <% end %> \
-      <% if_p('prometheus.storage.remote.timeout') do |timeout| %> \
-      -storage.remote.timeout="<%= timeout %>" \
+      <% if_p('prometheus.storage.local.target_heap_size') do |target_heap_size| %> \
+      -storage.local.target-heap-size="<%= target_heap_size %>" \
       <% end %> \
       <% if_p('prometheus.web.console.libraries') do |libraries| %> \
       -web.console.libraries="<%= libraries %>" \

jobs/prometheus/templates/config/prometheus.yml

@@ -24,7 +24,15 @@ rule_files: <%= p('prometheus.rule_files', []).to_json %>
 # A list of scrape configurations.
 scrape_configs: <%= p('prometheus.scrape_configs', []).to_json %>
 
+# Alerting specifies settings related to the Alertmanager.
+alerting: <%= p('prometheus.alerting', {}).to_json %>
+
 <% if_p('prometheus.remote_write') do |remote_write| %>
-# Write samples to remote storage.
+# Settings related to the experimental remote write feature.
 remote_write: <%= remote_write.to_json %>
 <% end %>
+
+<% if_p('prometheus.remote_read') do |remote_read| %>
+# Settings related to the experimental remote read feature.
+remote_read: <%= remote_read.to_json %>
+<% end %>