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

Added support for Prometheus #2465

Merged
merged 2 commits into from
Mar 25, 2024
Merged

Added support for Prometheus #2465

merged 2 commits into from
Mar 25, 2024

Conversation

ezio-auditore
Copy link
Contributor

@ezio-auditore ezio-auditore commented Feb 19, 2024 •
edited
Loading

Story link : RHSTOR-5367
Things added in this PR

  • Prometheus instance
  • Prometheus Service
  • AlertManager instance
  • Prometheus behing TLS
  • Check for ROSA HCP platform before setting up monitoring resources

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 19, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

rchikatw
rchikatw reviewed Feb 20, 2024
View reviewed changes
Copy link
Contributor

@rchikatw rchikatw left a comment

Choose a reason for hiding this comment

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

Please squash your commits & address lint failure as well.

controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
@ezio-auditore ezio-auditore force-pushed the prom branch 4 times, most recently from a5594af to c008773 Compare March 7, 2024 12:03
@ezio-auditore ezio-auditore marked this pull request as ready for review March 8, 2024 09:51
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 8, 2024
leelavg
leelavg reviewed Mar 8, 2024
View reviewed changes
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
templates/alertmanager.go Outdated Show resolved Hide resolved
controllers/platform/platform_detection.go Outdated Show resolved Hide resolved
controllers/platform/platform_detection.go Show resolved Hide resolved
controllers/platform/platform_detection.go Outdated Show resolved Hide resolved
deploy/ocs-operator/manifests/k8s-metrics-servicemonitor-role-binding.yaml Outdated Show resolved Hide resolved
templates/alertmanager.go Outdated Show resolved Hide resolved
templates/prometheus.go Outdated Show resolved Hide resolved
templates/prometheusproxynetworkpolicy.go Outdated Show resolved Hide resolved
leelavg
leelavg reviewed Mar 8, 2024
View reviewed changes
Copy link
Contributor

@leelavg leelavg left a comment

Choose a reason for hiding this comment

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

missed reviewing rest of this file earlier.

controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
nb-ohad
nb-ohad requested changes Mar 12, 2024
View reviewed changes
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
controllers/ocsinitialization/ocsinitialization_controller.go Outdated Show resolved Hide resolved
deploy/ocs-operator/manifests/odf-prometheus-role.yaml Outdated Show resolved Hide resolved
rbac/k8s-metrics-servicemonitor-role-binding.yaml Outdated Show resolved Hide resolved
rbac/k8s-metrics-servicemonitor-role.yaml Outdated Show resolved Hide resolved
rbac/odf-prometheus-role-binding.yaml Outdated Show resolved Hide resolved
rbac/odf-prometheus-role.yaml Outdated Show resolved Hide resolved
@ezio-auditore ezio-auditore force-pushed the prom branch 3 times, most recently from 2a94c3d to f118cfe Compare March 13, 2024 11:26
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 14, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 14, 2024
@agarwal-mudit agarwal-mudit requested review from umangachapagain and iamniting and removed request for rchikatw March 15, 2024 02:39
rewantsoni
rewantsoni reviewed Mar 19, 2024
View reviewed changes
controllers/platform/platform_detection.go Outdated Show resolved Hide resolved
rbac/odf-prometheus-operator-role-binding.yaml Outdated Show resolved Hide resolved
rbac/odf-promethues-operator-sa.yaml Outdated Show resolved Hide resolved
@nb-ohad
Copy link
Contributor

nb-ohad commented Mar 22, 2024

Changes looks good, putting an LGTM and a hold to wait for Eng last verifications
/hold
/lgtm

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 22, 2024
@ezio-auditore
Copy link
Contributor Author

/test ocs-operator-bundle-e2e-aws

3 similar comments
@ezio-auditore
Copy link
Contributor Author

/test ocs-operator-bundle-e2e-aws

@iamniting
Copy link
Member

/test ocs-operator-bundle-e2e-aws

@ezio-auditore
Copy link
Contributor Author

/test ocs-operator-bundle-e2e-aws

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2024
@nb-ohad
Copy link
Contributor

nb-ohad commented Mar 25, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2024
@nb-ohad
Copy link
Contributor

nb-ohad commented Mar 25, 2024

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 25, 2024
@iamniting iamniting mentioned this pull request Mar 25, 2024
Closed
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2024
@nb-ohad
Copy link
Contributor

nb-ohad commented Mar 25, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2024
@ezio-auditore
Copy link
Contributor Author

/test ocs-operator-bundle-e2e-aws

Kaustav Majumder added 2 commits March 26, 2024 01:08
Added prometheus support
113c39c 
Signed-off-by: Kaustav Majumder <[email protected]>
prometheus: generated changes
9b6e143 
Signed-off-by: Kaustav Majumder <[email protected]>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2024
@nb-ohad
Copy link
Contributor

nb-ohad commented Mar 25, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 25, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 25, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ezio-auditore, nb-ohad

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

@openshift-merge-bot openshift-merge-bot bot merged commit 109acbb into red-hat-storage:main Mar 25, 2024
11 checks passed
@ezio-auditore ezio-auditore mentioned this pull request Apr 29, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rchikatw rchikatw rchikatw left review comments

@rewantsoni rewantsoni rewantsoni left review comments

@iamniting iamniting iamniting requested changes

@nb-ohad nb-ohad nb-ohad requested changes

@umangachapagain umangachapagain umangachapagain requested changes

@leelavg leelavg Awaiting requested review from leelavg

Assignees

@umangachapagain umangachapagain

@nb-ohad nb-ohad

@iamniting iamniting

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@ezio-auditore @nb-ohad @iamniting @umangachapagain @rewantsoni @leelavg @rchikatw @openshift-merge-robot