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 prometheus default selectors for rules and service Monitors #92

Merged
merged 1 commit into from
Apr 4, 2017
Merged

Added prometheus default selectors for rules and service Monitors #92

merged 1 commit into from
Apr 4, 2017

Conversation

goruha
Copy link
Member

@goruha goruha commented Apr 4, 2017 •
edited
Loading

What

  • Added default selector for Service Monitor
  • Added default selector for Rules

Why

  • Default selectors useful for extend prometheus from external charts by defining Service Monitors and Rules

@goruha goruha merged commit 1e83d67 into master Apr 4, 2017
@goruha goruha requested a review from osterman April 4, 2017 11:05
osterman
osterman reviewed Apr 4, 2017
View reviewed changes
Copy link
Member

@osterman osterman left a comment

Choose a reason for hiding this comment

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

+2

@osterman osterman deleted the feature-prometheus-use-default-selectors-always branch April 4, 2017 16:23
goruha added a commit that referenced this pull request Apr 9, 2017
@goruha
Merge branch 'master' into fix-jenkins
7abff2f 
* master: (24 commits)
  Revert back exporter-kube-state into kube-prometheus deps (#105)
  Fix charts CI\CD (#104)
  Add Support for Email Alerts in Prometheus Alert Manager (#103)
  Prometheus 2.1 (#80)
  Added prometheus custom alerts chart (#102)
  Added prometheus exporter kubelets (#93)
  Added prometheus exporter kube state (#94)
  Added prometheus exporter kube scheduler (#95)
  Added prometheus exporter kube etcd (#96)
  Added prometheus exporter kube controller manager (#98)
  Added prometheus exporter kube api (#99)
  Added prometheus exporter kubernetes (#100)
  Added prometheus exporter node (#101)
  Added prometheus exporter kube dns (#97)
  Added prometheus default selectors for rules and service Monitors (#92)
  Support Operator 0.7.0 (#91)
  Bump Grafana Chart Version (#90)
  Add Kubernetes State Exporter for Prometheus (#85)
  Add Grafana (#86)
  Add Prometheus Operator (#81)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@osterman osterman osterman left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@goruha @osterman