kubernetes-fedora: Fix prometheus config

[Spyros Trigazis]

With the upgrade to kubernetes 1.7.x / atomic 26 it seems the kubernetes data is not being properly collected by prometheus or shown in grafana.
The whole setup of node-exported/prometheus/grafana looks ok, including the data source being created. Also some of the cluster data is available.
But with the default grafana dashboard no container or node data is shown.

Prometheus config needs to be kubernetes 1.7.3 (or later compatible).

Prometheus upstream issues: [1][2].
With this [3] it works.

[1] https://github.com/prometheus/prometheus/pull/2918
[2] https://github.com/prometheus/prometheus/issues/2916
[3] https://github.com/prometheus/prometheus/pull/2918/commits/94103aab2ce962e1d0d15df14213edb580922196

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/507445

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/507445
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=4aade351b07e04791d6ac9aa6a1abc8bc3a8f98e
Submitter: Jenkins
Branch: master

commit 4aade351b07e04791d6ac9aa6a1abc8bc3a8f98e
Author: Spyros Trigazis <email address hidden>
Date: Tue Sep 26 09:17:17 2017 +0000

    Fix prometheus scrape configuration

    Make prometheus configuration compatible with 1.7.3 or greater.
    The new config matches the one in the pormetheus kubernetes
    example [1] minus the configuration for ingress that we don't
    deploy.

    [1] https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml
    Closes-Bug: #1719187

    Change-Id: Ied8b8d8fb610e5ecba18e37f98dd1a4c9bddbf30

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/509791

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/509791
Committed: https://git.openstack.org/cgit/openstack/magnum/commit/?id=0475a84f0e92a7a5cf83377aee5517030c070dca
Submitter: Zuul
Branch: stable/pike

commit 0475a84f0e92a7a5cf83377aee5517030c070dca
Author: Spyros Trigazis <email address hidden>
Date: Tue Sep 26 09:17:17 2017 +0000

    Fix prometheus scrape configuration

    Make prometheus configuration compatible with 1.7.3 or greater.
    The new config matches the one in the pormetheus kubernetes
    example [1] minus the configuration for ingress that we don't
    deploy.

    [1] https://github.com/prometheus/prometheus/blob/master/documentation/examples/prometheus-kubernetes.yml
    Closes-Bug: #1719187

    Change-Id: Ied8b8d8fb610e5ecba18e37f98dd1a4c9bddbf30
    (cherry picked from commit 4aade351b07e04791d6ac9aa6a1abc8bc3a8f98e)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/magnum 6.0.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/magnum 5.0.2 release.