From cfba5c9af0a2f2240385530b022ce287e3a9ba88 Mon Sep 17 00:00:00 2001 From: Dmitry Nikolaev Date: Thu, 29 May 2025 09:27:34 +0200 Subject: [PATCH 1/2] Enforce UTC timestamps (regression affecting Windows) Signed-off-by: Dmitry Nikolaev --- grafana/rmf-app/package.json | 2 +- grafana/rmf-app/pkg/plugin/datasource.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/grafana/rmf-app/package.json b/grafana/rmf-app/package.json index 27503125..8c9223ab 100644 --- a/grafana/rmf-app/package.json +++ b/grafana/rmf-app/package.json @@ -1,7 +1,7 @@ { "author": "IBM", "name": "ibm-rmf", - "version": "1.0.9", + "version": "1.0.10", "description": "IBM RMF for z/OS", "license": "Apache-2.0", "scripts": { diff --git a/grafana/rmf-app/pkg/plugin/datasource.go b/grafana/rmf-app/pkg/plugin/datasource.go index 3cb980dc..4b052967 100644 --- a/grafana/rmf-app/pkg/plugin/datasource.go +++ b/grafana/rmf-app/pkg/plugin/datasource.go @@ -246,11 +246,11 @@ func (ds *RMFDatasource) QueryData(ctx context.Context, req *backend.QueryDataRe // Initialize time series stream step := getStep(mintime, q.Interval) fields := frame.SeriesFields{} - start := q.TimeRange.From + start := q.TimeRange.From.UTC() r := dds.NewRequest(params.Resource.Value, start, start, step) - f, jump, err := ds.getCachedTSFrames(r, q.TimeRange.To, step, fields) + f, jump, err := ds.getCachedTSFrames(r, q.TimeRange.To.UTC(), step, fields) if f == nil || err != nil { - f = frame.TaggedFrame(q.TimeRange.From, "No data yet...") + f = frame.TaggedFrame(start, "No data yet...") } channel := live.Channel{ Scope: live.ScopeDatasource, @@ -259,7 +259,7 @@ func (ds *RMFDatasource) QueryData(ctx context.Context, req *backend.QueryDataRe } cachedChannel := cache.Channel{ Resource: params.Resource.Value, - TimeRange: backend.TimeRange{From: start.Add(jump), To: q.TimeRange.To}, + TimeRange: backend.TimeRange{From: start.Add(jump), To: q.TimeRange.To.UTC()}, Absolute: params.AbsoluteTime, Step: step, Fields: fields, @@ -273,7 +273,7 @@ func (ds *RMFDatasource) QueryData(ctx context.Context, req *backend.QueryDataRe } } else { // Query non-timeseries data - r := dds.NewRequest(params.Resource.Value, q.TimeRange.From, q.TimeRange.To, mintime) + r := dds.NewRequest(params.Resource.Value, q.TimeRange.From.UTC(), q.TimeRange.To.UTC(), mintime) response = &backend.DataResponse{} // FIXME: doesn't it need to be cached? if newFrame, err := ds.getFrame(r, false); err != nil { From 231758e0be858cd448e479decec3118938c1aae9 Mon Sep 17 00:00:00 2001 From: Dmitry Nikolaev Date: Fri, 30 May 2025 08:49:15 +0200 Subject: [PATCH 2/2] Doc update v1.0.10 Signed-off-by: Dmitry Nikolaev --- .../grafana/rmf-app/access_grafana_zosmf.html | 26 +- docs/grafana/rmf-app/alerts.html | 26 +- docs/grafana/rmf-app/apply_visualize.html | 26 +- docs/grafana/rmf-app/commonltr.css | 642 +++++ docs/grafana/rmf-app/commonrtl.css | 692 +++++ docs/grafana/rmf-app/create_datasources.html | 26 +- docs/grafana/rmf-app/cshelp.html | 10 - docs/grafana/rmf-app/db_ovw.html | 30 +- .../grafana/rmf-app/define_grafana_zosmf.html | 26 +- docs/grafana/rmf-app/error_reports.html | 26 +- .../grafana/rmf-app/grafana_config_parms.html | 33 +- docs/grafana/rmf-app/grafana_via_zosmf.html | 30 +- docs/grafana/rmf-app/historical_data.html | 26 +- docs/grafana/rmf-app/index.html | 12 +- docs/grafana/rmf-app/indexTerms.html | 7 +- .../rmf-app/install_grafana_plugin.html | 26 +- docs/grafana/rmf-app/license-3rd-party.txt | 4 +- .../rmf-app/oxygen-webhelp/app/config.js | 8 +- .../app/context-help/context-help.js | 5 +- .../oxygen-webhelp/app/core/permalink.js | 14 +- .../oxygen-webhelp/app/core/webhelp.css | 34 +- .../oxygen-webhelp/app/core/webhelp.js | 252 +- .../app/core/wh-bootstrap-fix.css | 6 - .../oxygen-webhelp/app/core/wh-breadcrumb.css | 22 +- .../oxygen-webhelp/app/core/wh-common.css | 3 + .../core/wh-publication-logo-and-title.css | 2 +- .../app/core/wh-responsive-images.css | 4 +- .../oxygen-webhelp/app/core/wh-sticky.js | 2 - .../oxygen-webhelp/app/core/wh-toc.css | 1 - .../app/core/wh-tools-and-navigation.css | 4 +- .../rmf-app/oxygen-webhelp/app/cshelp-page.js | 11 - .../oxygen-webhelp/app/indexterms-page.css | 10 +- .../oxygen-webhelp/app/indexterms-page.js | 23 +- .../app/localization/localization.js | 2 +- .../rmf-app/oxygen-webhelp/app/main-page.css | 8 +- .../rmf-app/oxygen-webhelp/app/main-page.js | 4 +- ...8e188.js => grafana_via_zosmf-d324e188.js} | 2 +- .../app/nav-links/json/nav-links.js | 2 +- ...f-d358e207.js => prereq_zosmf-d324e207.js} | 2 +- .../app/nav-links/nav-links.css | 1 - .../app/nav-links/toc-loader.js | 4 - .../oxygen-webhelp/app/options/properties.js | 3 - .../oxygen-webhelp/app/search-page.css | 8 +- .../rmf-app/oxygen-webhelp/app/search-page.js | 4 +- .../app/search/index/htmlFileInfoList.js | 2 +- .../app/search/index/index-1.js | 2 +- .../app/search/index/index-2.js | 2 +- .../app/search/index/index-3.js | 2 +- .../app/search/index/keywords.js | 33 +- .../app/search/index/link-to-parent.js | 2 +- .../oxygen-webhelp/app/search/search.js | 704 ++++- .../oxygen-webhelp/app/search/searchAPI.js | 195 -- .../app/search/searchAutocomplete.js | 2 +- .../oxygen-webhelp/app/search/searchEngine.js | 72 - .../app/search/searchPresenter.js | 426 --- .../app/search/webhelpSearchEngine.js | 111 - .../app/side-notes/p-side-notes.css | 2 +- .../oxygen-webhelp/app/topic-page-basic.css | 6 +- .../rmf-app/oxygen-webhelp/app/topic-page.css | 12 +- .../rmf-app/oxygen-webhelp/app/topic-page.js | 4 +- .../oxygen-webhelp/app/topic/commonltr.css | 253 +- .../oxygen-webhelp/app/topic/elements.css | 5 - .../oxygen-webhelp/app/topic/print.css | 34 +- .../oxygen-webhelp/app/topic/topic.css | 8 +- .../rmf-app/oxygen-webhelp/app/util/util.js | 23 + .../lib/jquery-ui/jquery-ui.min.css | 4 +- .../lib/jquery-ui/jquery-ui.min.js | 7 +- docs/grafana/rmf-app/pdf/rmf_grafana.pdf | Bin 982201 -> 981449 bytes docs/grafana/rmf-app/pdf_guide.html | 26 +- docs/grafana/rmf-app/prereq_zosmf.html | 34 +- docs/grafana/rmf-app/query_lang.html | 36 +- docs/grafana/rmf-app/rn.html | 43 +- docs/grafana/rmf-app/search.html | 8 +- docs/grafana/rmf-app/sitemap.xml | 79 - docs/grafana/rmf-app/ts_issues.html | 30 +- docs/grafana/rmf-app/update_plugin.html | 26 +- docs/grafana/rmf-app/variables.html | 34 +- docs/grafana/rmf-app/visual_grafana.html | 26 +- grafana/rmf-app/CHANGELOG.md | 4 + grafana/rmf-app/doc/src/pdf/rmf_grafana.fo | 2200 --------------- .../doc/src/pdf/rmf_grafana.merged.html | 1582 ----------- .../doc/src/pdf/rmf_grafana.merged.xml | 1723 ------------ grafana/rmf-app/doc/src/pdf/rmf_grafana.pdf | Bin 982201 -> 981449 bytes .../rmf-app/doc/src/pdf/rmf_grafana.style.xml | 2386 ----------------- grafana/rmf-app/doc/src/rn.dita | 9 + 85 files changed, 2772 insertions(+), 9494 deletions(-) create mode 100644 docs/grafana/rmf-app/commonltr.css create mode 100644 docs/grafana/rmf-app/commonrtl.css delete mode 100644 docs/grafana/rmf-app/cshelp.html delete mode 100644 docs/grafana/rmf-app/oxygen-webhelp/app/cshelp-page.js rename docs/grafana/rmf-app/oxygen-webhelp/app/nav-links/json/{grafana_via_zosmf-d358e188.js => grafana_via_zosmf-d324e188.js} (81%) rename docs/grafana/rmf-app/oxygen-webhelp/app/nav-links/json/{prereq_zosmf-d358e207.js => prereq_zosmf-d324e207.js} (83%) delete mode 100644 docs/grafana/rmf-app/oxygen-webhelp/app/search/searchAPI.js delete mode 100644 docs/grafana/rmf-app/oxygen-webhelp/app/search/searchEngine.js delete mode 100644 docs/grafana/rmf-app/oxygen-webhelp/app/search/searchPresenter.js delete mode 100644 docs/grafana/rmf-app/oxygen-webhelp/app/search/webhelpSearchEngine.js delete mode 100644 docs/grafana/rmf-app/sitemap.xml delete mode 100644 grafana/rmf-app/doc/src/pdf/rmf_grafana.fo delete mode 100644 grafana/rmf-app/doc/src/pdf/rmf_grafana.merged.html delete mode 100644 grafana/rmf-app/doc/src/pdf/rmf_grafana.merged.xml delete mode 100644 grafana/rmf-app/doc/src/pdf/rmf_grafana.style.xml diff --git a/docs/grafana/rmf-app/access_grafana_zosmf.html b/docs/grafana/rmf-app/access_grafana_zosmf.html index fc22e228..ae911872 100644 --- a/docs/grafana/rmf-app/access_grafana_zosmf.html +++ b/docs/grafana/rmf-app/access_grafana_zosmf.html @@ -1,19 +1,19 @@ - + - Accessing the Grafana dashboard + Accessing the Grafana dashboard - + - + @@ -74,6 +74,7 @@ +
@@ -101,10 +102,14 @@
+
+ @@ -119,13 +124,11 @@
-