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

[grafana] feat: adds multi-org support to sidecar dashboards #2939

Closed
wants to merge 10 commits into from

Conversation

mango-matt
Copy link

@mango-matt mango-matt commented Jan 26, 2024

converts sidecar.dashboards.provider to a list at
sidecar.dashboards.providers allowing the definition of multiple
providers that can be mappped to orgs as required.

still supports the singular variant to retain backwards compatibility
and will prepend it to any configured providers

Results in multi-org support defining providers like the example below which

sidecar:
    dashboards:
      enabled: true
      providers:
        - name: prod
          orgid: 1
        - name: nonprod
          orgid: 2
        - name: ops
          orgid: 3

This then allows dashboard configmaps to be define the annotation k8s-sidecar-target-directory: /tmp/dashboards/ops instructing the sidecar to put the dashboard in the folder that's been specific in our configuration above.

apiVersion: v1
kind: ConfigMap
metadata:
  name: my-dashboard
  namespace: monitoring
  labels:
    grafana_dashboard: '1'
  annotations:
    k8s-sidecar-target-directory: /tmp/dashboards/ops/
data:
  my-dashboard.json: |-
   {}

@CLAassistant
Copy link

CLAassistant commented Jan 26, 2024

CLA assistant check
All committers have signed the CLA.

converts `sidecar.dashboards.provider` to a list at
`sidecar.dashboards.providers` allowing the definition of multiple
providers that can be mappped to orgs as required.

still supports the singular variant to retain backwards compatibility
and will prepend it to any configured `providers`

Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>
…ore concise values

Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>
…of the provider if not provided

Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>
updates documentatoin to indicate optoinal values and defaults for
providers

Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>\
Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>
@zanhsieh zanhsieh changed the title feat: adds multi-org support to sidecar dashboards [grafana] feat: adds multi-org support to sidecar dashboards Jan 29, 2024
Signed-off-by: MH <zanhsieh@gmail.com>
… lint checks

Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>
mango-matt and others added 2 commits February 6, 2024 10:09
Co-authored-by: MH <zanhsieh@gmail.com>
Signed-off-by: Matt Cockayne <matthew.cockayne@mangopay.com>
@mango-matt
Copy link
Author

closing as have been made aware that multi-org features are not being pursued

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants