DEV-46435 Grafana 10 error 500 on get api datasources//uid//uid//reso…

…urces
logzio · Oct 21, 2024 · d8146f0 · d8146f0
1 parent feb9b9d
commit d8146f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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
+ARG VERSION
+RUN echo "$VERSION" > /var/version.txt
+
 USER "$GF_UID"
-ENTRYPOINT [ "/run.sh" ]
+ENTRYPOINT [ "/run.sh" ]
diff --git a/public/app/features/playlist/ShareModal.tsx b/public/app/features/playlist/ShareModal.tsx
@@ -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;
   }

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -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(''))