From 13097e5d1e9ecc020578b664b2fe4fd9f4f1d3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Santos=20Oliveira?= Date: Fri, 27 Jun 2025 16:59:54 +0100 Subject: [PATCH 1/2] fix: added datasources to grafana during scaffolding --- .../%version%/datasources/datasources.yaml | 187 +++++++++++++++++- 1 file changed, 186 insertions(+), 1 deletion(-) diff --git a/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml b/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml index 6ccdafa4d..d794e97b9 100644 --- a/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml +++ b/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml @@ -4,8 +4,193 @@ datasources: #if (app) - name: CMF gRPC Datasource type: criticalmanufacturing-grpc-datasource + uid: KHanA1bVk + access: proxy + url: + user: + database: + basicAuth: false + isDefault: false jsonData: - endpoint: : + endpoint: data-manager:6189 + + - name: DataManager-Cubes + type: retrodaredevil-wildgraphql-datasource + uid: PCqMAq1QX + access: proxy + url: http://traefik:8082/datamanager/cube/graphql + user: + database: + basicAuth: false + isDefault: false + jsonData: + + - name: DataManager-OData-Apps + type: criticalmanufacturing-odata-datasource + uid: lywgWAC7S + access: proxy + url: http://traefik:8081/datamanager/odata/apps + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-CDM + type: criticalmanufacturing-odata-datasource + uid: r1Y5GTCpa + access: proxy + url: http://traefik:8081/datamanager/odata/cdm + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-DWH + type: criticalmanufacturing-odata-datasource + uid: 97e8uVcB5 + access: proxy + url: http://traefik:8081/datamanager/odata/dwh + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-IoTEvents + type: criticalmanufacturing-odata-datasource + uid: 1rStvySjN + access: proxy + url: http://traefik:8081/datamanager/odata/iotevents + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-ODS + type: criticalmanufacturing-odata-datasource + uid: QwTFQXDwo + access: proxy + url: http://traefik:8081/datamanager/odata/ods + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-UserDefined + type: criticalmanufacturing-odata-datasource + uid: rYpwDuuQK + access: proxy + url: http://traefik:8081/datamanager/odata/userdefined + user: + database: + basicAuth: false + isDefault: false + + - name: DataManager-OData-Apps + type: criticalmanufacturing-odata-datasource + uid: lywgWAC7S + access: proxy + url: http://traefik:8081/datamanager/odata/apps + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-CDM + type: criticalmanufacturing-odata-datasource + uid: r1Y5GTCpa + access: proxy + url: http://traefik:8081/datamanager/odata/cdm + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-DWH + type: criticalmanufacturing-odata-datasource + uid: 97e8uVcB5 + access: proxy + url: http://traefik:8081/datamanager/odata/dwh + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-IoTEvents + type: criticalmanufacturing-odata-datasource + uid: 1rStvySjN + access: proxy + url: http://traefik:8081/datamanager/odata/iotevents + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-ODS + type: criticalmanufacturing-odata-datasource + uid: QwTFQXDwo + access: proxy + url: http://traefik:8081/datamanager/odata/ods + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + + - name: DataManager-OData-UserDefined + type: criticalmanufacturing-odata-datasource + uid: rYpwDuuQK + access: proxy + url: http://traefik:8081/datamanager/odata/userdefined + user: + database: + basicAuth: false + isDefault: false + jsonData: + keepCookies: + - access_token + tlsSkipVerify: true + keepCookies: + - access_token + tlsSkipVerify: true #else ~ #endif From a3af7dc260813f0380a4f7e668da321d2e45f6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Santos=20Oliveira?= Date: Fri, 27 Jun 2025 17:09:39 +0100 Subject: [PATCH 2/2] fix: removed unnecessary datasources --- .../%version%/datasources/datasources.yaml | 87 ------------------- 1 file changed, 87 deletions(-) diff --git a/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml b/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml index d794e97b9..f8443cedf 100644 --- a/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml +++ b/cmf-cli/resources/template_feed/grafana/Grafana.Package/%version%/datasources/datasources.yaml @@ -104,93 +104,6 @@ datasources: database: basicAuth: false isDefault: false - - - name: DataManager-OData-Apps - type: criticalmanufacturing-odata-datasource - uid: lywgWAC7S - access: proxy - url: http://traefik:8081/datamanager/odata/apps - user: - database: - basicAuth: false - isDefault: false - jsonData: - keepCookies: - - access_token - tlsSkipVerify: true - - - name: DataManager-OData-CDM - type: criticalmanufacturing-odata-datasource - uid: r1Y5GTCpa - access: proxy - url: http://traefik:8081/datamanager/odata/cdm - user: - database: - basicAuth: false - isDefault: false - jsonData: - keepCookies: - - access_token - tlsSkipVerify: true - - - name: DataManager-OData-DWH - type: criticalmanufacturing-odata-datasource - uid: 97e8uVcB5 - access: proxy - url: http://traefik:8081/datamanager/odata/dwh - user: - database: - basicAuth: false - isDefault: false - jsonData: - keepCookies: - - access_token - tlsSkipVerify: true - - - name: DataManager-OData-IoTEvents - type: criticalmanufacturing-odata-datasource - uid: 1rStvySjN - access: proxy - url: http://traefik:8081/datamanager/odata/iotevents - user: - database: - basicAuth: false - isDefault: false - jsonData: - keepCookies: - - access_token - tlsSkipVerify: true - - - name: DataManager-OData-ODS - type: criticalmanufacturing-odata-datasource - uid: QwTFQXDwo - access: proxy - url: http://traefik:8081/datamanager/odata/ods - user: - database: - basicAuth: false - isDefault: false - jsonData: - keepCookies: - - access_token - tlsSkipVerify: true - - - name: DataManager-OData-UserDefined - type: criticalmanufacturing-odata-datasource - uid: rYpwDuuQK - access: proxy - url: http://traefik:8081/datamanager/odata/userdefined - user: - database: - basicAuth: false - isDefault: false - jsonData: - keepCookies: - - access_token - tlsSkipVerify: true - keepCookies: - - access_token - tlsSkipVerify: true #else ~ #endif