Commit fa2c9b4f authored by godog's avatar godog
Browse files

Merge branch 'prometheus-max-samples' into 'master'

Limit maximum query size for Prometheus

See merge request !212
parents b2768114 a2425ceb
Pipeline #17355 passed with stages
in 5 minutes and 44 seconds
...@@ -132,7 +132,7 @@ prometheus: ...@@ -132,7 +132,7 @@ prometheus:
volumes: volumes:
- /etc/prometheus: /etc/prometheus - /etc/prometheus: /etc/prometheus
- /var/lib/prometheus/metrics2: /var/lib/prometheus/metrics2 - /var/lib/prometheus/metrics2: /var/lib/prometheus/metrics2
args: "--storage.tsdb.retention.time={{ prometheus_tsdb_retention | default('90d') }} --web.external-url=https://monitor.{{ domain_public[0] }} --web.enable-lifecycle" args: "--storage.tsdb.retention.time={{ prometheus_tsdb_retention | default('90d') }} --web.external-url=https://monitor.{{ domain_public[0] }} --web.enable-lifecycle --query.max-samples={{ prometheus_max_samples | default('5000000') }}"
- name: alertmanager - name: alertmanager
image: registry.git.autistici.org/ai3/docker/prometheus-alertmanager:master image: registry.git.autistici.org/ai3/docker/prometheus-alertmanager:master
ports: ports:
......
...@@ -60,7 +60,7 @@ prometheus: ...@@ -60,7 +60,7 @@ prometheus:
volumes: volumes:
- /etc/prometheus: /etc/prometheus - /etc/prometheus: /etc/prometheus
- /var/lib/prometheus/metrics2: /var/lib/prometheus/metrics2 - /var/lib/prometheus/metrics2: /var/lib/prometheus/metrics2
args: "--storage.tsdb.retention.time={{ prometheus_tsdb_retention | default('90d') }} --web.external-url=https://monitor.{{ domain_public[0] }} --web.enable-lifecycle" args: "--storage.tsdb.retention.time={{ prometheus_tsdb_retention | default('90d') }} --web.external-url=https://monitor.{{ domain_public[0] }} --web.enable-lifecycle --query.max-samples={{ prometheus_max_samples | default('5000000') }}"
- name: alertmanager - name: alertmanager
image: registry.git.autistici.org/ai3/docker/prometheus-alertmanager:master image: registry.git.autistici.org/ai3/docker/prometheus-alertmanager:master
ports: ports:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment