Skip to content

DEV-46435 Grafana 10 error 500 on get api datasources uid uid resources #63

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

Merged
merged 3 commits into from
Oct 21, 2024
Merged

DEV-46435 Grafana 10 error 500 on get api datasources uid uid resources #63

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
b0ead24
Skip check version
copyhold Oct 20, 2024
8178d92
Update ShareModal.tsx
copyhold Oct 21, 2024
1a7342e
Update Dockerfile
copyhold Oct 21, 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
6 changes: 5 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,5 +189,9 @@ ARG RUN_SH=grafana/packaging/docker/run.sh

COPY ${RUN_SH} /run.sh

# LOGZ.IO GRAFANA CHANGE :: Add unique file to avoid ECR tag limit
Copy link

Choose a reason for hiding this comment

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

there's no ticket reference to this change?
where is this change coming from? 🤔

ARG VERSION
RUN echo "$VERSION" > /var/version.txt

USER "$GF_UID"
ENTRYPOINT [ "/run.sh" ]
ENTRYPOINT [ "/run.sh" ]
4 changes: 2 additions & 2 deletions public/app/features/playlist/ShareModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ export const ShareModal = ({ playlistUid, onDismiss }: Props) => {

const params: UrlQueryMap = {};
if (mode) {
params.kiosk = mode;
}
params.kiosk = mode.toString(); // LOGZ.IO GRAFANA CHANGE :: DEV-42761 fix playlist sharing url
}
if (autoFit) {
params.autofitpanels = true;
}
Expand Down
1 change: 1 addition & 0 deletions public/app/plugins/datasource/elasticsearch/datasource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,7 @@ export class ElasticDatasource
}

private getDatabaseVersionUncached(): Promise<SemVer | null> {
return Promise.resolve(null); // LOGZ.IO GRAFANA CHANGE :: DEV-46435-grafana-10-error-500-on-get-api-datasources-uid-uid-resources
// we want this function to never fail
const getDbVersionObservable = config.featureToggles.enableElasticsearchBackendQuerying
? from(this.getResourceRequest(''))
Expand Down