Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

[stable/prometheus-operator] Re-sync prometheus rules and grafana dashboards #21248

Merged
merged 19 commits into from
Apr 2, 2020
Merged

[stable/prometheus-operator] Re-sync prometheus rules and grafana dashboards #21248

merged 19 commits into from
Apr 2, 2020

Commits on Mar 4, 2020

  1. Re-sync prometheus rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 4, 2020
    Configuration menu
    Copy the full SHA
    4c1c03b View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Manually fix special notiation in prometheus rules 

    I see that this was previously manually fixed as well, so I kept it like before

Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    dfde2a2 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    e2c7491 View commit details
    Browse the repository at this point in the history

  3. Bump chart version 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    c890e30 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    2b958f0 View commit details
    Browse the repository at this point in the history

  2. Bump patch version 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    20f6030 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2020

  1. Fix Helm interpolation escaping in sync scripts 

    This should fix the issue of having a backtick (`) inside a {{ ... }} command block in prometheus syntax.

As per #21248 (comment)

Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    f44d206 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    9346d8b View commit details
    Browse the repository at this point in the history

  3. Bump patch version 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    38916a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. Remove unnecessary whitespace 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    fcac933 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    0dfa81e View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    8b2580a View commit details
    Browse the repository at this point in the history

  2. Bump patch version 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 17, 2020
    Configuration menu
    Copy the full SHA
    0556b3d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    763c222 View commit details
    Browse the repository at this point in the history

  2. Bump prometheus-operator chart patch version 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    126305a View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. Update prometheus rules gain 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    4f05c5a View commit details
    Browse the repository at this point in the history

  2. Sync grafana dashboards as well 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    c68ec85 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Merge remote-tracking branch 'helm/master' into update-rules 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    4fd68b6 View commit details
    Browse the repository at this point in the history

  2. Bump patch version for prometheus-operator chart 

    Signed-off-by: iuri aranda <[email protected]>
    @iuriaranda
    iuriaranda committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    e03f15a View commit details
    Browse the repository at this point in the history