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.

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

Update manifests to latest version of Prometheus Operator #16

Merged
merged 5 commits into from
Dec 10, 2016

Commits on Dec 2, 2016

  1. Configuration menu
    Copy the full SHA
    20f88ee View commit details
    Browse the repository at this point in the history
  2. manifests: remove prometheus.io/scrape annotations

    These annotations made sense in pre v1.3.0 Prometheus releases, however,
    with >=v1.3.0 and the Prometheus Operator these annotations are more
    confusing then helpful.
    brancz committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    0c1bb5c View commit details
    Browse the repository at this point in the history
  3. manifests: add Alertmanager manifests and discovery

    The latest version of the Prometheus Operator requires Prometheus
    >=v1.4.0 for the Alertmanger discovery feature.
    brancz committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    d0c1fb5 View commit details
    Browse the repository at this point in the history
  4. manifests/k8s: add service for discovering kube-dns metrics

    The ports reflect the upstream kube-dns manifests of bootkube and
    kubernetes/kubernetes.
    brancz committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    a40ca50 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2016

  1. Configuration menu
    Copy the full SHA
    cbf8673 View commit details
    Browse the repository at this point in the history