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

[stable/grafana]: Only replace variable datasources in shared dashboards #21710

Merged
merged 1 commit into from
Apr 11, 2020
Merged

[stable/grafana]: Only replace variable datasources in shared dashboards #21710

merged 1 commit into from
Apr 11, 2020

Conversation

languitar
Copy link
Contributor

@zanhsieh @rtluckie @maorfr

What this PR does / why we need it:

Avoid replacing hard-coded datasource entries in shared dashboards on
downloading them. This is the root causes for #21541, where the
following data source is also replace:

  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },

To avoid this situation, this commit adds the requirement that the
datasource entry to replace starts with a dollar sign as the first
character in the quoted string region. This was the case for all
dashboards that I have checked.

Which issue this PR fixes

Special notes for your reviewer:

Checklist

  • DCO signed
  • Chart Version bumped
  • Variables are documented in the README.md
  • Title of the PR starts with chart name (e.g. [stable/mychartname])

@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 1, 2020
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 1, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @languitar. Thanks for your PR.

I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@languitar
Copy link
Contributor Author

/assign @zanhsieh
/ok-to-test

@k8s-ci-robot
Copy link
Contributor

@languitar: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/assign @zanhsieh
/ok-to-test

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@languitar languitar changed the title stable/grafana: Only replace variable datasources in shared dashboards [stable/grafana]: Only replace variable datasources in shared dashboards Apr 2, 2020
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 5.0.10
version: 5.0.11
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should be 5.0.12 now.

@zanhsieh
Copy link
Collaborator

zanhsieh commented Apr 2, 2020

@languitar
Sorry for late reviewing due to e2e test pipeline broken (see #21609) Could you bump the version again to latest as requested? Thank you.

@languitar
Copy link
Contributor Author

@zanhsieh new commit is pushed with an updated version

@zanhsieh
Copy link
Collaborator

zanhsieh commented Apr 5, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 5, 2020
@zanhsieh
Copy link
Collaborator

zanhsieh commented Apr 5, 2020

/test pull-charts-e2

Avoid replacing hard-coded datasource entries in shared dashboards on
downloading them. This is the root causes for #21541, where the
following data source is also replace:

```json
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
```

To avoid this situation, this commit adds the requirement that the
datasource entry to replace starts with a dollar sign as the first
character in the quoted string region. This was the case for all
dashboards that I have checked.

fixes #21541

Signed-off-by: Johannes Wienke <[email protected]>
@languitar
Copy link
Contributor Author

And once more...

@zanhsieh
Copy link
Collaborator

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: languitar, zanhsieh

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

@k8s-ci-robot k8s-ci-robot added 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. labels Apr 11, 2020
@k8s-ci-robot k8s-ci-robot merged commit 60b2dbc into helm:master Apr 11, 2020
irlevesque pushed a commit to quantopian/charts that referenced this pull request Jul 13, 2020
Avoid replacing hard-coded datasource entries in shared dashboards on
downloading them. This is the root causes for helm#21541, where the
following data source is also replace:

```json
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
```

To avoid this situation, this commit adds the requirement that the
datasource entry to replace starts with a dollar sign as the first
character in the quoted string region. This was the case for all
dashboards that I have checked.

fixes helm#21541

Signed-off-by: Johannes Wienke <[email protected]>
includerandom pushed a commit to includerandom/helm_charts that referenced this pull request Jul 19, 2020
Avoid replacing hard-coded datasource entries in shared dashboards on
downloading them. This is the root causes for helm#21541, where the
following data source is also replace:

```json
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
```

To avoid this situation, this commit adds the requirement that the
datasource entry to replace starts with a dollar sign as the first
character in the quoted string region. This was the case for all
dashboards that I have checked.

fixes helm#21541

Signed-off-by: Johannes Wienke <[email protected]>
li-adrienloiseau pushed a commit to li-adrienloiseau/charts that referenced this pull request Jul 29, 2020
Avoid replacing hard-coded datasource entries in shared dashboards on
downloading them. This is the root causes for helm#21541, where the
following data source is also replace:

```json
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
```

To avoid this situation, this commit adds the requirement that the
datasource entry to replace starts with a dollar sign as the first
character in the quoted string region. This was the case for all
dashboards that I have checked.

fixes helm#21541

Signed-off-by: Johannes Wienke <[email protected]>
Signed-off-by: Adrien Loiseau <[email protected]>
mmingorance-dh pushed a commit to mmingorance-dh/charts that referenced this pull request Aug 28, 2020
Avoid replacing hard-coded datasource entries in shared dashboards on
downloading them. This is the root causes for helm#21541, where the
following data source is also replace:

```json
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
```

To avoid this situation, this commit adds the requirement that the
datasource entry to replace starts with a dollar sign as the first
character in the quoted string region. This was the case for all
dashboards that I have checked.

fixes helm#21541

Signed-off-by: Johannes Wienke <[email protected]>
Signed-off-by: Miguel Mingorance <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
4 participants