[pkgsrc/trunk]: pkgsrc/www/grafana grafana: Update to 7.1.5.

To: source-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/grafana grafana: Update to 7.1.5.
From: jperkin <jperkin%pkgsrc.org@localhost>
Date: Thu, 27 Aug 2020 14:01:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/2eee3f8a60db
branches:  trunk
changeset: 437605:2eee3f8a60db
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Aug 27 13:05:20 2020 +0000

description:
grafana: Update to 7.1.5.

The release notes are too long and contain too many hyperlinks to be useful in
this commit message, so please see these URLs for an overview of changes in
each major and minor release since 6.7.3.

  https://community.grafana.com/t/release-notes-v7-1-x/32967
  https://community.grafana.com/t/release-notes-v7-0-x/29381
  https://community.grafana.com/t/release-notes-v6-7-x/27119

diffstat:

 www/grafana/Makefile                                     |    22 +-
 www/grafana/PLIST                                        |  1035 ++-
 www/grafana/distinfo                                     |  3303 +++++++++++++-
 www/grafana/go-modules.mk                                |   823 +++
 www/grafana/patches/patch-pkg_cmd_grafana-server_main.go |    19 +
 5 files changed, 4751 insertions(+), 451 deletions(-)

diffs (truncated from 5900 to 300 lines):

diff -r f8f57d5997b6 -r 2eee3f8a60db www/grafana/Makefile
--- a/www/grafana/Makefile      Thu Aug 27 12:41:30 2020 +0000
+++ b/www/grafana/Makefile      Thu Aug 27 13:05:20 2020 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2020/08/14 20:01:21 bsiegert Exp $
+# $NetBSD: Makefile,v 1.32 2020/08/27 13:05:20 jperkin Exp $
 
-DISTNAME=      grafana-6.7.3
-PKGREVISION=   3
+DISTNAME=      grafana-7.1.5
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -23,9 +22,8 @@
 GO_DIST_BASE=          ${DISTNAME}
 GO_SRCPATH=            github.com/grafana/grafana
 
-#BUILD_DEPENDS+=       yarn>=1.15.0:../../devel/yarn
-
 CHECK_PORTABILITY_SKIP=                packaging/* devenv/*
+CHECK_PORTABILITY_SKIP+=       packages/grafana-toolkit/docker/*
 
 CHECK_RELRO_SKIP+=             bin/grafana-cli
 CHECK_RELRO_SKIP+=             bin/grafana-server
@@ -40,17 +38,20 @@
 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
+SUBST_FILES.fix-cfg=   conf/sample.ini pkg/cmd/grafana-server/main.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'
 SUBST_SED.fix-cfg+=    -e 's,^;\(static_root_path = \).*,\1${PUBLICDIR},g'
+SUBST_VARS.fix-cfg=    DATADIR PKG_SYSCONFDIR PREFIX
 
 BUILD_DEFS+=           GRAFANA_USER GRAFANA_GROUP VARBASE
 FILES_SUBST+=          GRAFANA_USER=${GRAFANA_USER:Q}
 FILES_SUBST+=          GRAFANA_GROUP=${GRAFANA_GROUP:Q}
 FILES_SUBST+=          DATADIR=${DATADIR:Q}
 
+.include "go-modules.mk"
+
 .include "../../lang/go/go-vars.mk"
 .include "../../mk/bsd.prefs.mk"
 
@@ -66,21 +67,20 @@
 RCD_SCRIPTS=           grafana
 
 INSTALLATION_DIRS+=    bin
-INSTALLATION_DIRS+=    share/examples/grafana
 INSTALLATION_DIRS+=    share/grafana/public
 
 CONF_FILES+=   ${PREFIX}/share/grafana/conf/sample.ini \
                ${PKG_SYSCONFDIR}/grafana.conf
 
-#post-build:
-#      cd ${WRKSRC} && yarn install --pure-lockfile && yarn build
+do-build:
+       cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO} run build.go build
 
 do-install:
-       cd ${WRKDIR} && ${PAX} -rw bin ${DESTDIR}${PREFIX}
+       cd ${WRKSRC} && ${INSTALL_PROGRAM} bin/*/grafana-{cli,server} ${DESTDIR}${PREFIX}/bin/
        cd ${WRKDIR}/linux/${DISTNAME}/public && \
                ${PAX} -rw . ${DESTDIR}${PUBLICDIR}
        cd ${WRKSRC} && ${PAX} -rw conf \
                ${DESTDIR}${PREFIX}/share/grafana/
 
-.include "../../lang/go/go-package.mk"
+.include "../../lang/go/go-module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f8f57d5997b6 -r 2eee3f8a60db www/grafana/PLIST
--- a/www/grafana/PLIST Thu Aug 27 12:41:30 2020 +0000
+++ b/www/grafana/PLIST Thu Aug 27 13:05:20 2020 +0000
@@ -1,16 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2020/05/01 22:04:05 tnn Exp $
-bin/alert_webhook_listener
+@comment $NetBSD: PLIST,v 1.7 2020/08/27 13:05:20 jperkin Exp $
 bin/grafana-cli
 bin/grafana-server
-bin/release_publisher
-bin/slow_proxy
-bin/slow_proxy_mac
 share/grafana/conf/defaults.ini
 share/grafana/conf/ldap.toml
 share/grafana/conf/ldap_multiple.toml
 share/grafana/conf/provisioning/dashboards/sample.yaml
 share/grafana/conf/provisioning/datasources/sample.yaml
 share/grafana/conf/provisioning/notifiers/sample.yaml
+share/grafana/conf/provisioning/plugins/sample.yaml
 share/grafana/conf/sample.ini
 share/grafana/public/app/app.ts
 share/grafana/public/app/core/actions/cleanUp.ts
@@ -23,6 +20,7 @@
 share/grafana/public/app/core/components/AppNotifications/AppNotificationList.tsx
 share/grafana/public/app/core/components/BackButton/BackButton.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/CopyToClipboard/CopyToClipboard.tsx
 share/grafana/public/app/core/components/DynamicImports/ErrorLoadingChunk.tsx
 share/grafana/public/app/core/components/DynamicImports/LoadingChunkPlaceHolder.tsx
@@ -31,12 +29,16 @@
 share/grafana/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
 share/grafana/public/app/core/components/FilterInput/FilterInput.tsx
 share/grafana/public/app/core/components/Footer/Footer.tsx
+share/grafana/public/app/core/components/ForgottenPassword/ChangePassword.tsx
+share/grafana/public/app/core/components/ForgottenPassword/ChangePasswordPage.tsx
+share/grafana/public/app/core/components/ForgottenPassword/ForgottenPassword.tsx
+share/grafana/public/app/core/components/ForgottenPassword/SendResetMailPage.tsx
 share/grafana/public/app/core/components/LayoutSelector/LayoutSelector.tsx
 share/grafana/public/app/core/components/LocalStorageValueProvider/LocalStorageValueProvider.tsx
 share/grafana/public/app/core/components/LocalStorageValueProvider/index.tsx
-share/grafana/public/app/core/components/Login/ChangePassword.tsx
 share/grafana/public/app/core/components/Login/LoginCtrl.tsx
 share/grafana/public/app/core/components/Login/LoginForm.tsx
+share/grafana/public/app/core/components/Login/LoginLayout.tsx
 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
@@ -49,19 +51,24 @@
 share/grafana/public/app/core/components/PageHeader/PageHeader.test.tsx
 share/grafana/public/app/core/components/PageHeader/PageHeader.tsx
 share/grafana/public/app/core/components/PageLoader/PageLoader.tsx
-share/grafana/public/app/core/components/PasswordInput/PasswordInput.tsx
 share/grafana/public/app/core/components/PermissionList/AddPermission.tsx
 share/grafana/public/app/core/components/PermissionList/DisabledPermissionListItem.tsx
 share/grafana/public/app/core/components/PermissionList/PermissionList.tsx
 share/grafana/public/app/core/components/PermissionList/PermissionListItem.tsx
 share/grafana/public/app/core/components/PermissionList/PermissionsInfo.tsx
 share/grafana/public/app/core/components/PluginHelp/PluginHelp.tsx
+share/grafana/public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx
+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/Select/DataSourcePicker.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/SortPicker.tsx
 share/grafana/public/app/core/components/Select/TeamPicker.test.tsx
 share/grafana/public/app/core/components/Select/TeamPicker.tsx
 share/grafana/public/app/core/components/Select/UserPicker.test.tsx
@@ -75,6 +82,15 @@
 share/grafana/public/app/core/components/TagFilter/TagOption.tsx
 share/grafana/public/app/core/components/TagFilter/TagValue.tsx
 share/grafana/public/app/core/components/TimePicker/TimePickerWithHistory.tsx
+share/grafana/public/app/core/components/TransformersUI/CalculateFieldTransformerEditor.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/LabelsToFieldsTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/MergeTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/OrganizeFieldsTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/ReduceTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx
+share/grafana/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx
 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
@@ -86,17 +102,10 @@
 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/layout_selector/layout_selector.ts
-share/grafana/public/app/core/components/manage_dashboards/manage_dashboards.html
-share/grafana/public/app/core/components/manage_dashboards/manage_dashboards.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/SearchField.tsx
-share/grafana/public/app/core/components/search/search.html
-share/grafana/public/app/core/components/search/search.ts
-share/grafana/public/app/core/components/search/search_results.html
 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
@@ -122,6 +131,8 @@
 share/grafana/public/app/core/components/sidemenu/__snapshots__/SignIn.test.tsx.snap
 share/grafana/public/app/core/components/sidemenu/__snapshots__/TopSection.test.tsx.snap
 share/grafana/public/app/core/components/sidemenu/__snapshots__/TopSectionItem.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
@@ -146,8 +157,8 @@
 share/grafana/public/app/core/directives/ng_model_on_blur.ts
 share/grafana/public/app/core/directives/rebuild_on_change.ts
 share/grafana/public/app/core/directives/tags.ts
-share/grafana/public/app/core/directives/value_select_dropdown.ts
 share/grafana/public/app/core/filters/filters.ts
+share/grafana/public/app/core/hooks/useNavModel.ts
 share/grafana/public/app/core/hooks/useRefMounted.ts
 share/grafana/public/app/core/jquery_extended.ts
 share/grafana/public/app/core/live/live_srv.ts
@@ -198,20 +209,13 @@
 share/grafana/public/app/core/specs/backend_srv.test.ts
 share/grafana/public/app/core/specs/emitter.test.ts
 share/grafana/public/app/core/specs/factors.test.ts
-share/grafana/public/app/core/specs/file_export.test.ts
 share/grafana/public/app/core/specs/flatten.test.ts
-share/grafana/public/app/core/specs/location_util.test.ts
-share/grafana/public/app/core/specs/manage_dashboards.test.ts
 share/grafana/public/app/core/specs/rangeutil.test.ts
-share/grafana/public/app/core/specs/search.test.ts
-share/grafana/public/app/core/specs/search_results.test.ts
 share/grafana/public/app/core/specs/search_srv.test.ts
 share/grafana/public/app/core/specs/store.test.ts
 share/grafana/public/app/core/specs/table_model.test.ts
 share/grafana/public/app/core/specs/ticks.test.ts
 share/grafana/public/app/core/specs/time_series.test.ts
-share/grafana/public/app/core/specs/url.test.ts
-share/grafana/public/app/core/specs/value_select_dropdown.test.ts
 share/grafana/public/app/core/store.ts
 share/grafana/public/app/core/table_model.ts
 share/grafana/public/app/core/time_series2.ts
@@ -228,6 +232,7 @@
 share/grafana/public/app/core/utils/dag.test.ts
 share/grafana/public/app/core/utils/dag.ts
 share/grafana/public/app/core/utils/deferred.ts
+share/grafana/public/app/core/utils/docsLinks.ts
 share/grafana/public/app/core/utils/emitter.ts
 share/grafana/public/app/core/utils/errors.test.ts
 share/grafana/public/app/core/utils/errors.ts
@@ -236,11 +241,9 @@
 share/grafana/public/app/core/utils/factors.ts
 share/grafana/public/app/core/utils/fetch.test.ts
 share/grafana/public/app/core/utils/fetch.ts
-share/grafana/public/app/core/utils/file_export.ts
 share/grafana/public/app/core/utils/flatten.ts
 share/grafana/public/app/core/utils/kbn.test.ts
 share/grafana/public/app/core/utils/kbn.ts
-share/grafana/public/app/core/utils/location_util.ts
 share/grafana/public/app/core/utils/model_utils.ts
 share/grafana/public/app/core/utils/outline.ts
 share/grafana/public/app/core/utils/promiseToDigest.test.ts
@@ -250,33 +253,32 @@
 share/grafana/public/app/core/utils/react2angular.ts
 share/grafana/public/app/core/utils/richHistory.test.ts
 share/grafana/public/app/core/utils/richHistory.ts
-share/grafana/public/app/core/utils/scrollbar.ts
 share/grafana/public/app/core/utils/sort_by_keys.ts
-share/grafana/public/app/core/utils/text.ts
+share/grafana/public/app/core/utils/standardTransformers.ts
 share/grafana/public/app/core/utils/ticks.ts
 share/grafana/public/app/core/utils/timePicker.test.ts
 share/grafana/public/app/core/utils/timePicker.ts
-share/grafana/public/app/core/utils/url.ts
 share/grafana/public/app/core/utils/version.ts
 share/grafana/public/app/dev.ts
 share/grafana/public/app/features/admin/AdminEditOrgCtrl.ts
-share/grafana/public/app/features/admin/AdminEditUserCtrl.ts
-share/grafana/public/app/features/admin/AdminListOrgsCtrl.ts
-share/grafana/public/app/features/admin/AdminListUsersCtrl.ts
+share/grafana/public/app/features/admin/AdminEditOrgPage.tsx
+share/grafana/public/app/features/admin/AdminListOrgsPage.tsx
+share/grafana/public/app/features/admin/AdminOrgsTable.tsx
 share/grafana/public/app/features/admin/AdminSettings.tsx
 share/grafana/public/app/features/admin/LicenseChrome.tsx
+share/grafana/public/app/features/admin/OrgRolePicker.tsx
 share/grafana/public/app/features/admin/ServerStats.test.tsx
 share/grafana/public/app/features/admin/ServerStats.tsx
 share/grafana/public/app/features/admin/UpgradePage.tsx
 share/grafana/public/app/features/admin/UserAdminPage.tsx
 share/grafana/public/app/features/admin/UserCreatePage.tsx
 share/grafana/public/app/features/admin/UserLdapSyncInfo.tsx
+share/grafana/public/app/features/admin/UserListAdminPage.tsx
 share/grafana/public/app/features/admin/UserOrgs.tsx
 share/grafana/public/app/features/admin/UserPermissions.tsx
 share/grafana/public/app/features/admin/UserProfile.tsx
 share/grafana/public/app/features/admin/UserSessions.tsx
 share/grafana/public/app/features/admin/UserSyncInfo.tsx
-share/grafana/public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
 share/grafana/public/app/features/admin/index.ts
 share/grafana/public/app/features/admin/ldap/LdapConnectionStatus.tsx
 share/grafana/public/app/features/admin/ldap/LdapPage.tsx
@@ -288,11 +290,8 @@
 share/grafana/public/app/features/admin/ldap/LdapUserTeams.tsx
 share/grafana/public/app/features/admin/partials/admin_home.html
 share/grafana/public/app/features/admin/partials/edit_org.html
-share/grafana/public/app/features/admin/partials/edit_user.html
-share/grafana/public/app/features/admin/partials/orgs.html
 share/grafana/public/app/features/admin/partials/stats.html
 share/grafana/public/app/features/admin/partials/styleguide.html
-share/grafana/public/app/features/admin/partials/users.html
 share/grafana/public/app/features/admin/state/actions.ts
 share/grafana/public/app/features/admin/state/apis.ts
 share/grafana/public/app/features/admin/state/reducers.test.ts
@@ -303,20 +302,23 @@
 share/grafana/public/app/features/alerting/AlertRuleList.tsx
 share/grafana/public/app/features/alerting/AlertTab.tsx
 share/grafana/public/app/features/alerting/AlertTabCtrl.ts
+share/grafana/public/app/features/alerting/NewAlertNotificationPage.tsx
 share/grafana/public/app/features/alerting/NotificationsEditCtrl.ts
-share/grafana/public/app/features/alerting/NotificationsListCtrl.ts
+share/grafana/public/app/features/alerting/NotificationsListPage.tsx
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/grafana grafana: reset maintainer
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils/xenkernel413 Remove Linux from ONLY_FOR_PLATF...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/grafana grafana: reset maintainer
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils/xenkernel413 Remove Linux from ONLY_FOR_PLATF...
Indexes:
Home | Main Index | Thread Index | Old Index