Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

fix(grafana): remove hardcoded control plane namespace #4454

Merged
merged 1 commit into from
Jan 18, 2022

Conversation

jaellio
Copy link
Contributor

@jaellio jaellio commented Jan 14, 2022

Description:

Removes the hardcoded default control plane namespace from the
Mesh and Envoy Details dashboard. Parameterizes the control plane
namespace. When installing OSM with automatic provisioning of
Prometheus and Grafana the control plane namespace variable will
be set to the namespace where OSM is being installed. When
importing the Mesh and Envoy Details dashboard, the user will have
the option to set the osm control plane namespace just as they are
able to set the datasource.

Resolves #4436

View when importing the Mesh and Envoy Details dashboard:
image

Testing done:

  • Installed locally built osm with automatic provisioning of Prometheus and Grafana in a namespace other than osm-system. Verified the Mesh and Envoy Details dashboard was accurately displaying data for the non-defualt namespace. Inspected the queries formatted with the control plane namespace input variable.
  • Imported the Mesh and Envoy Details dashboard via the import panel JSON. After loading the dashboard, the OSM Control Plane Namespace input box appeared. The dashboard reflected the namespace specified via the input.

Affected area:

Functional Area
New Functionality [ ]
CI System [ ]
CLI Tool [ ]
Certificate Management [ ]
Control Plane [ ]
Demo [ ]
Documentation [ ]
Egress [ ]
Ingress [ ]
Install [ ]
Networking [ ]
Observability [x]
Performance [ ]
SMI Policy [ ]
Security [ ]
Sidecar Injection [ ]
Tests [ ]
Upgrade [ ]
Other [ ]

Please answer the following questions with yes/no.

  1. Does this change contain code from or inspired by another project? No

    • Did you notify the maintainers and provide attribution?
  2. Is this a breaking change? No

Removes the hardcoded default control plane namespace from the
Mesh and Envoy Details dashboard. Parameterizes the control plane
namespace. When installing OSM with automatic provisioning of
prometheus and grafana the control plane namespace variable will
be set to the namespace where OSM is being installed. When
importing the Mesh and Envoy Details dashboard, the user will have
the option to set the osm control plane namespace just as they are
able to set the datasource.

Signed-off-by: jaellio <[email protected]>
@jaellio jaellio added the blocker/release=v1.0.0 Blocker for v1.0.0 release label Jan 14, 2022
@codecov-commenter
Copy link

codecov-commenter commented Jan 14, 2022

Codecov Report

Merging #4454 (e246b99) into main (95fb342) will increase coverage by 0.06%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4454      +/-   ##
==========================================
+ Coverage   69.14%   69.21%   +0.06%     
==========================================
  Files         212      212              
  Lines       14580    14580              
==========================================
+ Hits        10082    10092      +10     
+ Misses       4446     4436      -10     
  Partials       52       52              
Flag Coverage Δ
unittests 69.21% <ø> (+0.06%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/crdconversion/crdconversion.go 74.62% <0.00%> (+5.22%) ⬆️
pkg/messaging/workqueue.go 100.00% <0.00%> (+10.71%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 95fb342...e246b99. Read the comment docs.

@jaellio jaellio marked this pull request as ready for review January 14, 2022 23:22
Copy link
Member

@shashankram shashankram left a comment

Choose a reason for hiding this comment

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

Thanks @jaellio

Copy link
Contributor

@snehachhabria snehachhabria left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

@jaellio jaellio merged commit ec0da63 into openservicemesh:main Jan 18, 2022
jaellio added a commit to jaellio/osm that referenced this pull request Jan 18, 2022
…sh#4454)

Removes the hardcoded default control plane namespace from the
Mesh and Envoy Details dashboard. Parameterizes the control plane
namespace. When installing OSM with automatic provisioning of
prometheus and grafana the control plane namespace variable will
be set to the namespace where OSM is being installed. When
importing the Mesh and Envoy Details dashboard, the user will have
the option to set the osm control plane namespace just as they are
able to set the datasource.

Signed-off-by: jaellio <[email protected]>
jaellio added a commit to jaellio/osm that referenced this pull request Jan 19, 2022
…sh#4454)

Removes the hardcoded default control plane namespace from the
Mesh and Envoy Details dashboard. Parameterizes the control plane
namespace. When installing OSM with automatic provisioning of
prometheus and grafana the control plane namespace variable will
be set to the namespace where OSM is being installed. When
importing the Mesh and Envoy Details dashboard, the user will have
the option to set the osm control plane namespace just as they are
able to set the datasource.

Signed-off-by: jaellio <[email protected]>
jaellio added a commit that referenced this pull request Jan 19, 2022
Removes the hardcoded default control plane namespace from the
Mesh and Envoy Details dashboard. Parameterizes the control plane
namespace. When installing OSM with automatic provisioning of
prometheus and grafana the control plane namespace variable will
be set to the namespace where OSM is being installed. When
importing the Mesh and Envoy Details dashboard, the user will have
the option to set the osm control plane namespace just as they are
able to set the datasource.

Signed-off-by: jaellio <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
blocker/release=v1.0.0 Blocker for v1.0.0 release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

osm-system hardcoded as OSM control plane namespace in Mesh and Envoy Details Grafana dashboard
4 participants