Prometheus retention customization #2968

alexandre-allard · 2020-12-09T12:02:28Z

Component: salt, monitoring

Context: See #2953

Summary:

Acceptance criteria:

Closes: #2953

bert-e · 2020-12-09T12:02:30Z

Hello alexandre-allard-scality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2020-12-09T12:02:35Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

alexandre-allard · 2020-12-09T12:04:35Z

salt/metalk8s/addons/prometheus-operator/deployed/chart.sls

@@ -53429,7 +53429,7 @@ spec:
        - --path.sysfs=/host/sys
        - --path.rootfs=/host/root
        - --web.listen-address=$(HOST_IP):9100
-        - --collector.diskstats.ignored-devices=^(ram|fd|(h|s|v)d[a-z]|nvme\\d+n\\d+p)\\d+$
+        - --collector.diskstats.ignored-devices=^(ram|fd)\\d+$


Ignore this line as this comes from the Prometheus stack version bump (I forgot to re-render after having changed a parameter in charts/kube-prometheus-stack.yaml)

alexandre-allard · 2020-12-09T12:05:28Z

Do we want a changelog entry for this kind of stuff ?

gdemonet

Mostly about user-facing information. This PR would also need a changelog entry, since we're adding a feature (didn't see your comment, sorry).

docs/operation/cluster_and_service_configuration.rst

salt/metalk8s/addons/prometheus-operator/config/prometheus.yaml

bert-e · 2020-12-10T12:38:47Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following reviewers are expecting changes from the author, or must review again:

@gdemonet

bert-e · 2020-12-14T09:27:44Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

Refs: #2953

We set these with special variables that will be transformed into Jinja template by the chart renderer script which will allow to customize these fields at runtime through CSC mechanisms. Refs: #2953

Since we changed retention time and size in the charts, we need to regen it to apply changes. ``` ./charts/render.py prometheus-operator \ charts/kube-prometheus-stack.yaml \ charts/kube-prometheus-stack/ \ --namespace metalk8s-monitoring \ --service-config grafana \ metalk8s-grafana-config \ metalk8s/addons/prometheus-operator/config/grafana.yaml \ metalk8s-monitoring \ --service-config prometheus \ metalk8s-prometheus-config \ metalk8s/addons/prometheus-operator/config/prometheus.yaml \ metalk8s-monitoring \ --service-config alertmanager \ metalk8s-alertmanager-config \ metalk8s/addons/prometheus-operator/config/alertmanager.yaml \ metalk8s-monitoring \ --service-config dex \ metalk8s-dex-config \ metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \ --drop-prometheus-rules charts/drop-prometheus-rules.yaml \ > salt/metalk8s/addons/prometheus-operator/deployed/chart.sls ``` Refs: #2953

Explain how to change retention time and activate retention size using CSC ConfigMap. Refs: #2953

Refs: #2953

alexandre-allard · 2020-12-15T20:29:46Z

/approve

bert-e · 2020-12-15T20:29:51Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

bert-e · 2020-12-16T08:46:06Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.7

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2020-12-16T18:38:06Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.7

The following branches have NOT changed:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

alexandre-allard requested a review from a team as a code owner December 9, 2020 12:02

alexandre-allard commented Dec 9, 2020

View reviewed changes

gdemonet suggested changes Dec 10, 2020

View reviewed changes

docs/operation/cluster_and_service_configuration.rst Show resolved Hide resolved

salt/metalk8s/addons/prometheus-operator/config/prometheus.yaml Outdated Show resolved Hide resolved

alexandre-allard force-pushed the improvement/2953-csc-prometheus-retention branch from 72bfc9b to 885cf28 Compare December 14, 2020 09:16

alexandre-allard requested a review from gdemonet December 14, 2020 09:17

gdemonet previously approved these changes Dec 14, 2020

View reviewed changes

salt: Add CSC default values for Prometheus retention

9c69dd3

Refs: #2953

alexandre-allard dismissed gdemonet’s stale review via f7ab68b December 15, 2020 08:37

alexandre-allard force-pushed the improvement/2953-csc-prometheus-retention branch from 885cf28 to f7ab68b Compare December 15, 2020 08:37

alexandre-allard added 4 commits December 15, 2020 18:41

charts: Customize Prometheus time and size based retention

7558abe

We set these with special variables that will be transformed into Jinja template by the chart renderer script which will allow to customize these fields at runtime through CSC mechanisms. Refs: #2953

docs: Add Prometheus size and time retention.

f827d8c

Explain how to change retention time and activate retention size using CSC ConfigMap. Refs: #2953

Add CHANGELOG entry from Prometheus retention customization

1675e58

Refs: #2953

alexandre-allard force-pushed the improvement/2953-csc-prometheus-retention branch from f7ab68b to 1675e58 Compare December 15, 2020 17:41

gdemonet approved these changes Dec 16, 2020

View reviewed changes

bert-e merged commit 728094d into development/2.7 Dec 16, 2020

bert-e deleted the improvement/2953-csc-prometheus-retention branch December 16, 2020 18:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prometheus retention customization #2968

Prometheus retention customization #2968

alexandre-allard commented Dec 9, 2020

bert-e commented Dec 9, 2020

bert-e commented Dec 9, 2020

alexandre-allard Dec 9, 2020 •

edited

Loading

alexandre-allard commented Dec 9, 2020

gdemonet left a comment •

edited

Loading

bert-e commented Dec 10, 2020

bert-e commented Dec 14, 2020

alexandre-allard commented Dec 15, 2020

bert-e commented Dec 15, 2020

bert-e commented Dec 16, 2020

bert-e commented Dec 16, 2020

Prometheus retention customization #2968

Prometheus retention customization #2968

Conversation

alexandre-allard commented Dec 9, 2020

bert-e commented Dec 9, 2020

Hello alexandre-allard-scality,

bert-e commented Dec 9, 2020

Waiting for approval

alexandre-allard Dec 9, 2020 • edited Loading

Choose a reason for hiding this comment

alexandre-allard commented Dec 9, 2020

gdemonet left a comment • edited Loading

Choose a reason for hiding this comment

bert-e commented Dec 10, 2020

Waiting for approval

bert-e commented Dec 14, 2020

Waiting for approval

alexandre-allard commented Dec 15, 2020

bert-e commented Dec 15, 2020

Waiting for approval

bert-e commented Dec 16, 2020

In the queue

bert-e commented Dec 16, 2020

alexandre-allard Dec 9, 2020 •

edited

Loading

gdemonet left a comment •

edited

Loading