pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/grafana grafana: update to 8.3.1 (Only compile tes...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8a1a099d3e52
branches:  trunk
changeset: 770753:8a1a099d3e52
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Dec 08 01:51:47 2021 +0000

description:
grafana: update to 8.3.1 (Only compile tested, sorry.)

Security: Fixes CVE-2021-43798 directory traversal vulnerability.

Features and enhancements 8.3
  Alerting: Prevent folders from being deleted when they contain alerts.
  Alerting: Show full preview value in tooltip.
  BarGauge: Limit title width when name is really long.
  CloudMonitoring: Avoid to escape regexps in filters.
  CloudWatch: Add support for AWS Metric Insights.
  TooltipPlugin: Remove other panels' shared tooltip in edit panel.
  Visualizations: Limit y label width to 40% of visualization width.

Features and enhancements 8.2
  AWS: Updated AWS authentication documentation.
  Alerting: Added support Alertmanager data source for upstream Prometheus AM implementation.
  Alerting: Allows more characters in label names so notifications are sent.
  Alerting: Get alert rules for a dashboard or a panel using /api/v1/rules endpoints.
  Annotations: Improved rendering performance of event markers.
  CloudWatch Logs: Skip caching for log queries.
  Explore: Added an opt-in configuration for Node Graph in Jaeger, Zipkin, and Tempo.
  Packaging: Add stricter systemd unit options.
  Prometheus: Metrics browser can now handle label values with special characters.

diffstat:

 www/grafana/Makefile                                             |    16 +-
 www/grafana/PLIST                                                |  1551 +++-
 www/grafana/distinfo                                             |  3117 ++++++++-
 www/grafana/go-modules.mk                                        |  1035 ++-
 www/grafana/patches/patch-build.go                               |    42 -
 www/grafana/patches/patch-pkg_build_cmd.go                       |    34 +
 www/grafana/patches/patch-pkg_cmd_grafana-server_commands_cli.go |    20 +
 www/grafana/patches/patch-pkg_cmd_grafana-server_main.go         |    19 -
 8 files changed, 4553 insertions(+), 1281 deletions(-)

diffs (truncated from 10841 to 300 lines):

diff -r faca94ee93f3 -r 8a1a099d3e52 www/grafana/Makefile
--- a/www/grafana/Makefile      Wed Dec 08 01:32:02 2021 +0000
+++ b/www/grafana/Makefile      Wed Dec 08 01:51:47 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2021/11/05 20:02:50 bsiegert Exp $
+# $NetBSD: Makefile,v 1.57 2021/12/08 01:51:47 tnn Exp $
 
-DISTNAME=      grafana-8.1.3
-PKGREVISION=   3
+DISTNAME=      grafana-8.3.1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -20,6 +19,8 @@
 SITES.${FE_DISTNAME}=          https://dl.grafana.com/oss/release/
 EXTRACT_DIR.${FE_DISTNAME}=    ${WRKDIR}/linux
 
+BUILD_DEPENDS+=                        go-wire-[0-9]*:../../devel/go-wire
+
 CHECK_PORTABILITY_SKIP=                packaging/* devenv/*
 CHECK_PORTABILITY_SKIP+=       packages/grafana-toolkit/docker/*
 
@@ -33,7 +34,7 @@
 SUBST_CLASSES+=                fix-cfg
 SUBST_STAGE.fix-cfg=   pre-configure
 SUBST_MESSAGE.fix-cfg= Adding pkgsrc paths in sample config
-SUBST_FILES.fix-cfg=   conf/sample.ini pkg/cmd/grafana-server/main.go
+SUBST_FILES.fix-cfg=   conf/sample.ini pkg/cmd/grafana-server/commands/cli.go
 SUBST_SED.fix-cfg=     -e 's,^;\(data = \).*,\1${DATADIR},g'
 SUBST_SED.fix-cfg+=    -e 's,^;\(logs = \).*,\1${LOGDIR},g'
 SUBST_SED.fix-cfg+=    -e 's,^;\(plugins = \).*,\1${PLUGINDIR},g'
@@ -43,7 +44,7 @@
 SUBST_CLASSES+=                build
 SUBST_STAGE.build=     pre-build
 SUBST_MESSAGE.build=   Fixing go path in build.go
-SUBST_FILES.build=     build.go
+SUBST_FILES.build=     pkg/build/cmd.go
 SUBST_VARS.build=      GO
 
 BUILD_DEFS+=           GRAFANA_USER GRAFANA_GROUP VARBASE
@@ -73,7 +74,12 @@
 CONF_FILES+=   ${PREFIX}/share/grafana/conf/sample.ini \
                ${PKG_SYSCONFDIR}/grafana.conf
 
+BUILD_MAKE_FLAGS+=     GO=${GO}
+BUILD_MAKE_FLAGS+=     WIRE=${PREFIX}/bin/wire
+
+# These comands come from Makefile, build-go target.
 do-build:
+       cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/wire gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner
        cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO} run build.go build
 
 do-install:
diff -r faca94ee93f3 -r 8a1a099d3e52 www/grafana/PLIST
--- a/www/grafana/PLIST Wed Dec 08 01:32:02 2021 +0000
+++ b/www/grafana/PLIST Wed Dec 08 01:51:47 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2021/09/13 06:35:35 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.16 2021/12/08 01:51:47 tnn Exp $
 bin/grafana-cli
 bin/grafana-server
 share/grafana/conf/defaults.ini
@@ -14,22 +14,72 @@
 share/grafana/public/app/angular/AngularApp.ts
 share/grafana/public/app/angular/AngularLocationWrapper.test.ts
 share/grafana/public/app/angular/AngularLocationWrapper.ts
+share/grafana/public/app/angular/AngularRoot.tsx
+share/grafana/public/app/angular/GrafanaCtrl.ts
+share/grafana/public/app/angular/angular_wrappers.ts
 share/grafana/public/app/angular/array_join.ts
 share/grafana/public/app/angular/autofill_event_fix.ts
 share/grafana/public/app/angular/bridgeReactAngularRouting.ts
+share/grafana/public/app/angular/components/HttpSettingsCtrl.ts
+share/grafana/public/app/angular/components/TlsAuthSettingsCtrl.ts
+share/grafana/public/app/angular/components/code_editor/brace.d.ts
+share/grafana/public/app/angular/components/code_editor/code_editor.ts
+share/grafana/public/app/angular/components/code_editor/theme-grafana-dark.js
+share/grafana/public/app/angular/components/form_dropdown/form_dropdown.ts
+share/grafana/public/app/angular/components/info_popover.ts
+share/grafana/public/app/angular/components/jsontree.ts
+share/grafana/public/app/angular/components/plugin_component.ts
+share/grafana/public/app/angular/components/query_part.ts
+share/grafana/public/app/angular/components/query_part_editor.ts
+share/grafana/public/app/angular/components/scroll.ts
+share/grafana/public/app/angular/components/spectrum_picker.ts
+share/grafana/public/app/angular/components/sql_part/sql_part.ts
+share/grafana/public/app/angular/components/sql_part/sql_part_editor.ts
+share/grafana/public/app/angular/components/switch.ts
+share/grafana/public/app/angular/core_module.ts
 share/grafana/public/app/angular/diff-view.ts
 share/grafana/public/app/angular/dropdown_typeahead.ts
+share/grafana/public/app/angular/filters/filters.ts
 share/grafana/public/app/angular/give_focus.ts
+share/grafana/public/app/angular/index.ts
+share/grafana/public/app/angular/injectorMonkeyPatch.ts
+share/grafana/public/app/angular/lazyBootAngular.ts
 share/grafana/public/app/angular/metric_segment.ts
 share/grafana/public/app/angular/misc.ts
 share/grafana/public/app/angular/ng_model_on_blur.ts
+share/grafana/public/app/angular/panel/all.ts
+share/grafana/public/app/angular/panel/metrics_panel_ctrl.ts
+share/grafana/public/app/angular/panel/panel_ctrl.ts
+share/grafana/public/app/angular/panel/panel_directive.ts
+share/grafana/public/app/angular/panel/panel_editor_tab.ts
+share/grafana/public/app/angular/panel/partials/query_editor_row.html
+share/grafana/public/app/angular/panel/query_ctrl.ts
+share/grafana/public/app/angular/panel/query_editor_row.ts
+share/grafana/public/app/angular/panel/specs/metrics_panel_ctrl.test.ts
+share/grafana/public/app/angular/partials.ts
+share/grafana/public/app/angular/partials/http_settings.html
+share/grafana/public/app/angular/partials/http_settings_next.html
+share/grafana/public/app/angular/partials/tls_auth_settings.html
+share/grafana/public/app/angular/promiseToDigest.test.ts
+share/grafana/public/app/angular/promiseToDigest.ts
+share/grafana/public/app/angular/react2angular.ts
 share/grafana/public/app/angular/rebuild_on_change.ts
-share/grafana/public/app/angular/services.ts
+share/grafana/public/app/angular/registerComponents.ts
+share/grafana/public/app/angular/services/AngularLoader.ts
+share/grafana/public/app/angular/services/UtilSrv.ts
+share/grafana/public/app/angular/services/alert_srv.ts
+share/grafana/public/app/angular/services/annotations_srv.test.ts
+share/grafana/public/app/angular/services/annotations_srv.ts
+share/grafana/public/app/angular/services/dynamic_directive_srv.ts
+share/grafana/public/app/angular/services/nav_model_srv.ts
+share/grafana/public/app/angular/services/ng_react.ts
+share/grafana/public/app/angular/services/popover_srv.ts
+share/grafana/public/app/angular/services/segment_srv.ts
+share/grafana/public/app/angular/services/timer.ts
 share/grafana/public/app/angular/tags.ts
 share/grafana/public/app/app.ts
 share/grafana/public/app/core/actions/cleanUp.ts
 share/grafana/public/app/core/actions/index.ts
-share/grafana/public/app/core/angular_wrappers.ts
 share/grafana/public/app/core/app_events.ts
 share/grafana/public/app/core/components/Animations/FadeIn.tsx
 share/grafana/public/app/core/components/Animations/SlideDown.tsx
@@ -37,6 +87,7 @@
 share/grafana/public/app/core/components/AppNotifications/AppNotificationList.tsx
 share/grafana/public/app/core/components/Branding/Branding.tsx
 share/grafana/public/app/core/components/Card/Card.tsx
+share/grafana/public/app/core/components/CardButton.tsx
 share/grafana/public/app/core/components/CloseButton/CloseButton.tsx
 share/grafana/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
 share/grafana/public/app/core/components/DynamicImports/ErrorLoadingChunk.tsx
@@ -45,7 +96,6 @@
 share/grafana/public/app/core/components/DynamicImports/SafeDynamicImport.tsx
 share/grafana/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
 share/grafana/public/app/core/components/ErrorPage/ErrorPage.tsx
-share/grafana/public/app/core/components/FilterInput/FilterInput.tsx
 share/grafana/public/app/core/components/FolderFilter/FolderFilter.tsx
 share/grafana/public/app/core/components/Footer/Footer.tsx
 share/grafana/public/app/core/components/ForgottenPassword/ChangePassword.tsx
@@ -63,6 +113,22 @@
 share/grafana/public/app/core/components/Login/LoginPage.tsx
 share/grafana/public/app/core/components/Login/LoginServiceButtons.tsx
 share/grafana/public/app/core/components/Login/UserSignup.tsx
+share/grafana/public/app/core/components/NavBar/NavBar.test.tsx
+share/grafana/public/app/core/components/NavBar/NavBar.tsx
+share/grafana/public/app/core/components/NavBar/NavBarDropdown.test.tsx
+share/grafana/public/app/core/components/NavBar/NavBarDropdown.tsx
+share/grafana/public/app/core/components/NavBar/NavBarItem.test.tsx
+share/grafana/public/app/core/components/NavBar/NavBarItem.tsx
+share/grafana/public/app/core/components/NavBar/NavBarMenu.test.tsx
+share/grafana/public/app/core/components/NavBar/NavBarMenu.tsx
+share/grafana/public/app/core/components/NavBar/NavBarMenuItem.test.tsx
+share/grafana/public/app/core/components/NavBar/NavBarMenuItem.tsx
+share/grafana/public/app/core/components/NavBar/NavBarNext.test.tsx
+share/grafana/public/app/core/components/NavBar/NavBarNext.tsx
+share/grafana/public/app/core/components/NavBar/NavBarSection.tsx
+share/grafana/public/app/core/components/NavBar/utils.test.ts
+share/grafana/public/app/core/components/NavBar/utils.ts
+share/grafana/public/app/core/components/NodeGraphSettings.tsx
 share/grafana/public/app/core/components/OrgSwitcher.tsx
 share/grafana/public/app/core/components/Page/Page.tsx
 share/grafana/public/app/core/components/Page/PageContents.tsx
@@ -86,12 +152,21 @@
 share/grafana/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
 share/grafana/public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx
 share/grafana/public/app/core/components/QueryOperationRow/QueryOperationRow.tsx
-share/grafana/public/app/core/components/Select/DashboardPicker.tsx
+share/grafana/public/app/core/components/RolePicker/RolePicker.tsx
+share/grafana/public/app/core/components/RolePicker/RolePickerInput.tsx
+share/grafana/public/app/core/components/RolePicker/RolePickerMenu.tsx
+share/grafana/public/app/core/components/RolePicker/UserRolePicker.tsx
+share/grafana/public/app/core/components/RolePicker/ValueContainer.tsx
 share/grafana/public/app/core/components/Select/FolderPicker.test.tsx
 share/grafana/public/app/core/components/Select/FolderPicker.tsx
 share/grafana/public/app/core/components/Select/MetricSelect.test.tsx
 share/grafana/public/app/core/components/Select/MetricSelect.tsx
 share/grafana/public/app/core/components/Select/OrgPicker.tsx
+share/grafana/public/app/core/components/Select/ReadonlyFolderPicker/ReadonlyFolderPicker.test.tsx
+share/grafana/public/app/core/components/Select/ReadonlyFolderPicker/ReadonlyFolderPicker.tsx
+share/grafana/public/app/core/components/Select/ReadonlyFolderPicker/api.test.ts
+share/grafana/public/app/core/components/Select/ReadonlyFolderPicker/api.ts
+share/grafana/public/app/core/components/Select/ReadonlyFolderPicker/types.ts
 share/grafana/public/app/core/components/Select/SortPicker.tsx
 share/grafana/public/app/core/components/Select/TeamPicker.test.tsx
 share/grafana/public/app/core/components/Select/TeamPicker.tsx
@@ -113,6 +188,7 @@
 share/grafana/public/app/core/components/TraceToLogsSettings.tsx
 share/grafana/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/ConcatenateTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/ConvertFieldTypeTransformerEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/FilterByNameTransformerEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/FilterByRefIdTransformerEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/FilterByValueTransformer/FilterByValueFilterEditor.tsx
@@ -137,9 +213,17 @@
 share/grafana/public/app/core/components/TransformersUI/configFromQuery/ConfigFromQueryTransformerEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/configFromQuery/configFromQuery.test.ts
 share/grafana/public/app/core/components/TransformersUI/configFromQuery/configFromQuery.ts
+share/grafana/public/app/core/components/TransformersUI/extractFields/ExtractFieldsTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/extractFields/extractFields.test.ts
+share/grafana/public/app/core/components/TransformersUI/extractFields/extractFields.ts
+share/grafana/public/app/core/components/TransformersUI/extractFields/fieldExtractor.test.ts
+share/grafana/public/app/core/components/TransformersUI/extractFields/fieldExtractors.ts
 share/grafana/public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
 share/grafana/public/app/core/components/TransformersUI/fieldToConfigMapping/FieldToConfigMappingEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/fieldToConfigMapping/fieldToConfigMapping.ts
+share/grafana/public/app/core/components/TransformersUI/lookupGazetteer/FieldLookupTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/lookupGazetteer/fieldLookup.test.ts
+share/grafana/public/app/core/components/TransformersUI/lookupGazetteer/fieldLookup.ts
 share/grafana/public/app/core/components/TransformersUI/prepareTimeSeries/PrepareTimeSeriesEditor.tsx
 share/grafana/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.test.ts
 share/grafana/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.ts
@@ -149,63 +233,26 @@
 share/grafana/public/app/core/components/TransformersUI/rowsToFields/rowsToFields.ts
 share/grafana/public/app/core/components/TransformersUI/utils.ts
 share/grafana/public/app/core/components/WithFeatureToggle.tsx
-share/grafana/public/app/core/components/code_editor/brace.d.ts
-share/grafana/public/app/core/components/code_editor/code_editor.ts
-share/grafana/public/app/core/components/code_editor/theme-grafana-dark.js
-share/grafana/public/app/core/components/colorpicker/spectrum_picker.ts
 share/grafana/public/app/core/components/connectWithCleanUp.tsx
-share/grafana/public/app/core/components/dashboard_selector.ts
-share/grafana/public/app/core/components/form_dropdown/form_dropdown.ts
+share/grafana/public/app/core/components/editors/DashboardPicker.tsx
+share/grafana/public/app/core/components/editors/DashboardPickerByID.tsx
+share/grafana/public/app/core/components/editors/registry.tsx
 share/grafana/public/app/core/components/help/HelpModal.tsx
-share/grafana/public/app/core/components/info_popover.ts
-share/grafana/public/app/core/components/jsontree/jsontree.ts
 share/grafana/public/app/core/components/modals/AngularModalProxy.tsx
-share/grafana/public/app/core/components/query_part/query_part.ts
-share/grafana/public/app/core/components/query_part/query_part_editor.ts
-share/grafana/public/app/core/components/scroll/scroll.ts
 share/grafana/public/app/core/components/search/search_results.ts
-share/grafana/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
-share/grafana/public/app/core/components/sidemenu/BottomNavLinks.tsx
-share/grafana/public/app/core/components/sidemenu/BottomSection.test.tsx
-share/grafana/public/app/core/components/sidemenu/BottomSection.tsx
-share/grafana/public/app/core/components/sidemenu/DropDownChild.test.tsx
-share/grafana/public/app/core/components/sidemenu/DropDownChild.tsx
-share/grafana/public/app/core/components/sidemenu/SideMenu.test.tsx
-share/grafana/public/app/core/components/sidemenu/SideMenu.tsx
-share/grafana/public/app/core/components/sidemenu/SideMenuDropDown.test.tsx
-share/grafana/public/app/core/components/sidemenu/SideMenuDropDown.tsx
-share/grafana/public/app/core/components/sidemenu/SignIn.test.tsx
-share/grafana/public/app/core/components/sidemenu/SignIn.tsx
-share/grafana/public/app/core/components/sidemenu/TopSection.test.tsx
-share/grafana/public/app/core/components/sidemenu/TopSection.tsx
-share/grafana/public/app/core/components/sidemenu/TopSectionItem.test.tsx
-share/grafana/public/app/core/components/sidemenu/TopSectionItem.tsx
-share/grafana/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
-share/grafana/public/app/core/components/sidemenu/__snapshots__/BottomSection.test.tsx.snap
-share/grafana/public/app/core/components/sidemenu/__snapshots__/DropDownChild.test.tsx.snap
-share/grafana/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap
-share/grafana/public/app/core/components/sidemenu/utils.test.ts
-share/grafana/public/app/core/components/sidemenu/utils.ts
-share/grafana/public/app/core/components/sql_part/sql_part.ts
-share/grafana/public/app/core/components/sql_part/sql_part_editor.ts
-share/grafana/public/app/core/components/switch.ts
 share/grafana/public/app/core/config.ts
 share/grafana/public/app/core/constants.ts
 share/grafana/public/app/core/copy/appNotification.ts
 share/grafana/public/app/core/core.ts
-share/grafana/public/app/core/core_module.ts
-share/grafana/public/app/core/filters/filters.ts
 share/grafana/public/app/core/hooks/useCleanup.ts
 share/grafana/public/app/core/hooks/useNavModel.ts
 share/grafana/public/app/core/hooks/useQueryParams.ts
 share/grafana/public/app/core/hooks/useRefMounted.ts
-share/grafana/public/app/core/injectorMonkeyPatch.ts
 share/grafana/public/app/core/jquery_extended.ts
 share/grafana/public/app/core/lodash_extended.ts
 share/grafana/public/app/core/logs_model.test.ts
 share/grafana/public/app/core/logs_model.ts
 share/grafana/public/app/core/mod_defs.d.ts
-share/grafana/public/app/core/nav_model_srv.ts
 share/grafana/public/app/core/navigation/GrafanaRoute.test.tsx
 share/grafana/public/app/core/navigation/GrafanaRoute.tsx
 share/grafana/public/app/core/navigation/RouterDebugger.tsx
@@ -219,7 +266,6 @@
 share/grafana/public/app/core/navigation/queryString.ts
 share/grafana/public/app/core/navigation/testRoutes.tsx
 share/grafana/public/app/core/navigation/types.ts
-share/grafana/public/app/core/partials.ts
 share/grafana/public/app/core/profiler.ts
 share/grafana/public/app/core/reducers/appNotification.test.ts
 share/grafana/public/app/core/reducers/appNotification.ts
Home | Main Index | Thread Index | Old Index