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

Jump to bottom

Update grafusion #8

Merged
merged 17 commits into from
Apr 26, 2024
Merged

Update grafusion #8

merged 17 commits into from
Apr 26, 2024

Conversation

Umaaz
Copy link
Member

@Umaaz Umaaz commented Apr 10, 2024 •
edited
Loading

What is this feature?

This updates grafana 10.2.3 to include the customizations for grafusion.

@Umaaz
Copy link
Member Author

Umaaz commented Apr 10, 2024

I have made some changes to re add some code that was removed. The functionality can be achieved by disabling the feature in the config.

dhodgsonintergral
dhodgsonintergral reviewed Apr 21, 2024
View reviewed changes
Copy link
Contributor

@dhodgsonintergral dhodgsonintergral left a comment

Choose a reason for hiding this comment

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

Comments Explain each part of the code from me.

conf/defaults.ini Show resolved Hide resolved
packages/grafana-data/src/types/config.ts Show resolved Hide resolved
packages/grafana-runtime/src/config.ts Show resolved Hide resolved
pkg/api/dtos/frontend_settings.go Show resolved Hide resolved
pkg/api/frontendsettings.go Show resolved Hide resolved
public/app/features/dashboard/containers/DashboardPage.tsx Show resolved Hide resolved
public/app/features/explore/TraceView/components/TracePageHeader/Actions/TracePageActions.tsx Show resolved Hide resolved
public/app/features/templating/template_srv.ts Show resolved Hide resolved
public/app/plugins/datasource/grafana/components/QueryEditor.tsx Show resolved Hide resolved
public/app/types/dashboard.ts Show resolved Hide resolved
@Umaaz Umaaz merged commit 3c2e9a3 into main Apr 26, 2024
6 checks passed
@Umaaz Umaaz deleted the update_grafusion branch April 26, 2024 10:35
Umaaz pushed a commit that referenced this pull request Jul 17, 2024
@grafana-delivery-bot @gabor
[v11.0.x] Revert "Postgres: Switch the datasource plugin from lib/pq …
ae73f31 
…to pgx (#8… (#85517)

Revert "Postgres: Switch the datasource plugin from lib/pq to pgx (#8… (#85509)

Revert "Postgres: Switch the datasource plugin from lib/pq to pgx (#83768)"

This reverts commit ecd6de8.

(cherry picked from commit 8159e1d)

Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhodgsonintergral dhodgsonintergral dhodgsonintergral left review comments

@Nihasa350 Nihasa350 Nihasa350 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Umaaz @Nihasa350 @dhodgsonintergral @glend1