Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove prom rules and Service Monitor from openshift monitoring namespace #1256

Merged
merged 10 commits into from
Oct 19, 2023
Merged

Remove prom rules and Service Monitor from openshift monitoring namespace #1256

merged 10 commits into from
Oct 19, 2023

Conversation

coleenquadros
Copy link
Contributor

@coleenquadros coleenquadros commented Oct 16, 2023 •
edited
Loading

  • Remove Prometheus Rules from openshift-montioring namespace
  • Remove Service Monitors from openshift-montioring namespace
  • Change ns for the creation of service account

https://issues.redhat.com/browse/RHOBS-920

@coleenquadros
Copy link
Contributor Author

/retest-required

@coleenquadros
Copy link
Contributor Author

Verification

coquadro@coquadro-mac prometheus-2.47.1.darwin-arm64 % oc get prometheusrules -n open-cluster-management-observability
NAME                            AGE
acm-observability-alert-rules   20m
coquadro@coquadro-mac prometheus-2.47.1.darwin-arm64 % oc get prometheusrules -n openshift-monitoring                 
NAME                                           AGE
alertmanager-main-rules                        18d
cluster-monitoring-operator-prometheus-rules   18d
kube-state-metrics-rules                       18d
kubernetes-monitoring-rules                    18d
node-exporter-rules                            18d
prometheus-k8s-prometheus-rules                18d
prometheus-k8s-thanos-sidecar-rules            18d
prometheus-operator-rules                      18d
telemetry                                      18d
thanos-querier                                 18d
coquadro@coquadro-mac prometheus-2.47.1.darwin-arm64 %

@coleenquadros coleenquadros requested review from marcolan018 and subbarao-meduri and removed request for marcolan018 October 16, 2023 09:32
saswatamcode
saswatamcode approved these changes Oct 16, 2023
View reviewed changes
Copy link
Member

@saswatamcode saswatamcode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! But might need to fix some tests.

@coleenquadros coleenquadros force-pushed the remove_prometheus_rules branch from 4233830 to a345393 Compare October 16, 2023 11:31
@saswatamcode
Copy link
Member

/retest

@coleenquadros
Copy link
Contributor Author

/test test-e2e

@coleenquadros coleenquadros force-pushed the remove_prometheus_rules branch from 9749013 to 53229c1 Compare October 17, 2023 13:15
@coleenquadros
Copy link
Contributor Author

coleenquadros commented Oct 17, 2023 •
edited
Loading

Before

coquadro@coquadro-mac multicluster-observability-operator % oc get servicemonitor -n openshift-monitoring  
NAME                                            AGE
alertmanager-main                               19d
cluster-monitoring-operator                     19d
etcd                                            19d
kube-state-metrics                              19d
kubelet                                         19d
node-exporter                                   19d
observability-observatorium-api                 5d12h
observability-thanos-compact                    5d12h
observability-thanos-query                      5d12h
observability-thanos-query-frontend             5d12h
observability-thanos-query-frontend-memcached   5d12h
observability-thanos-receive                    5d12h
observability-thanos-receive-controller         5d12h
observability-thanos-rule                       5d12h
observability-thanos-store-memcached            5d12h
observability-thanos-store-shard                5d12h
openshift-state-metrics                         19d
prometheus-adapter                              19d
prometheus-k8s                                  19d
prometheus-operator                             19d
telemeter-client                                19d
thanos-querier                                  19d
thanos-sidecar                                  19d

After

coquadro@coquadro-mac multicluster-observability-operator % oc get servicemonitor -n openshift-monitoring                 
NAME                          AGE
alertmanager-main             19d
cluster-monitoring-operator   19d
etcd                          19d
kube-state-metrics            19d
kubelet                       19d
node-exporter                 19d
openshift-state-metrics       19d
prometheus-adapter            19d
prometheus-k8s                19d
prometheus-operator           19d
telemeter-client              19d
thanos-querier                19d
thanos-sidecar                19d

coquadro@coquadro-mac multicluster-observability-operator % oc get servicemonitor -n open-cluster-management-observability
NAME                                            AGE
observability-observatorium-api                 5d13h
observability-thanos-compact                    5d13h
observability-thanos-query                      5d13h
observability-thanos-query-frontend             5d13h
observability-thanos-query-frontend-memcached   5d13h
observability-thanos-receive                    5d13h
observability-thanos-receive-controller         5d13h
observability-thanos-rule                       5d13h
observability-thanos-store-memcached            5d13h
observability-thanos-store-shard                5d13h

@coleenquadros coleenquadros changed the title remove prom rules from openshift monitoring namespace Remove prom rules and Service Monitor from openshift monitoring namespace Oct 17, 2023
@coleenquadros coleenquadros force-pushed the remove_prometheus_rules branch from d161666 to cde7ffd Compare October 18, 2023 07:35
@coleenquadros
Copy link
Contributor Author

/test test-unit

@coleenquadros coleenquadros force-pushed the remove_prometheus_rules branch from a67c5dd to ca1cbf5 Compare October 18, 2023 15:21
@coleenquadros
remove prom rules from os monitoring space
ce709da 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
avoid check for delete in unit test
4463ef6 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
format
7852a3f 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
delete service monitor in openshift montitoring namespace
7829961 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
refactor sm controller and add tests
2be1928 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
format
60f8863 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
clean comments
3370d1c 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
typo
538cd31 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros coleenquadros force-pushed the remove_prometheus_rules branch from 28835bb to 538cd31 Compare October 18, 2023 21:22
@coleenquadros
typo
7aa9799 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@coleenquadros
typo
481b052 
Signed-off-by: Coleen Iona Quadros <[email protected]>
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

48.6% 48.6% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@openshift-ci
Copy link

openshift-ci bot commented Oct 18, 2023 •
edited
Loading

@coleenquadros: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/sonarcloud 481b052 link true /test sonarcloud

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

subbarao-meduri
subbarao-meduri approved these changes Oct 19, 2023
View reviewed changes
Copy link
Collaborator

@subbarao-meduri subbarao-meduri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Oct 19, 2023
@openshift-ci
Copy link

openshift-ci bot commented Oct 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: coleenquadros, saswatamcode, subbarao-meduri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@subbarao-meduri subbarao-meduri merged commit e63bfa9 into stolostron:main Oct 19, 2023
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saswatamcode saswatamcode saswatamcode approved these changes

@subbarao-meduri subbarao-meduri subbarao-meduri approved these changes

Assignees

@subbarao-meduri subbarao-meduri

@saswatamcode saswatamcode

Labels
approved dco-signoff: yes lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@coleenquadros @saswatamcode @subbarao-meduri @openshift-merge-robot