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.

Sign up for GitHub

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

INFRA-871 Remove angular plugins from Grafana #1388

Merged
merged 3 commits into from
Dec 13, 2024
Merged

INFRA-871 Remove angular plugins from Grafana #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4429d8a
Remove angular plugins from Grafana
technowhizz Nov 27, 2024
33f8628
Add CVE-2024-8986 to allow list for grafana
technowhizz Nov 28, 2024
213a494
Bump tag for new grafana images
technowhizz Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions etc/kayobe/kolla-image-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,6 @@ kolla_image_tags:
letsencrypt:
rocky-9: 2024.1-rocky-9-20241206T090120
ubuntu-jammy: 2024.1-ubuntu-jammy-20241206T090120
grafana:
rocky-9: 2024.1-rocky-9-20241128T123708
ubuntu-jammy: 2024.1-ubuntu-jammy-20241128T123708
4 changes: 1 addition & 3 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,7 @@ kolla_build_blocks:
ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
grafana_plugins_install: |
RUN grafana-cli plugins install vonage-status-panel \
&& grafana-cli plugins install grafana-piechart-panel \
&& grafana-cli plugins install grafana-opensearch-datasource \
&& grafana-cli plugins install gnocchixyz-gnocchi-datasource
&& grafana-cli plugins install grafana-opensearch-datasource
ironic_inspector_header: |
ADD additions-archive /
magnum_base_footer: |
Expand Down
3 changes: 3 additions & 0 deletions etc/kayobe/trivy/allowed-vulnerabilities.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
# - CVE-2023-31047
fluentd_allowed_vulnerabilities:
- CVE-2024-27280
grafana_allowed_vulnerabilities:
- CVE-2024-8986
technowhizz marked this conversation as resolved.
Show resolved Hide resolved


###############################################################################
# Dummy variable to allow Ansible to accept this file.
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/grafana-remove-angular-plugins-1c10e83ddb6556f4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Grafana now refuses to load AngularJS plugins. As such the
``grafana-piechart-panel`` and ``gnocchixyz-gnocchi-datasource`` plugins
have been removed from the Grafana image.