pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/grafana grafana: updated to 6.1.6
details: https://anonhg.NetBSD.org/pkgsrc/rev/06e100484a6b
branches: trunk
changeset: 334211:06e100484a6b
user: adam <adam%pkgsrc.org@localhost>
date: Tue May 21 08:32:04 2019 +0000
description:
grafana: updated to 6.1.6
6.1.6:
Features / Enhancements
Security: Bump jQuery to 3.4.0
Bug Fixes
Playlist: Fix loading dashboards by tag.
6.1.5:
Security: Urgent security patch release.
6.1.4:
Bug Fixes
DataPanel: Added missing built-in interval variables to scopedVars.
Explore: Adds maxDataPoints to data source query options .
Explore: Fixes so intervals are recalculated on run query.
Heatmap: Fix for empty graph when panel is too narrow.
Heatmap: Fixed auto decimals when bucket name is not number.
QueryInspector: Now shows error responses again.
6.1.3:
Bug Fixes
Graph: Fixed auto decimals in legend values for some units like ms and s.
Graph: Fixed png rendering with legend to the right.
Singlestat: Use decimals when manually specified.
UI Switch: Fix broken UI switches. Fixes Default Data Source switch, Explore Logs switches, Gauge option switches.
6.1.2:
Bug Fixes
Graph: Fixed series legend color for hidden series.
Graph: Fixed tooltip highlight on white theme.
Styles: Fixed menu hover highlight border.
Singlestat Panel: Correctly use the override decimals.
6.1.1:
Bug Fixes
Alerting: Notification channel http api fixes.
Graphite: Editing graphite query function now works again.
Playlist: Kiosk & auto fit panels modes are working normally again .
QueryEditors: Toggle edit mode now always work on slower computers.
6.1.0:
Bug Fixes
CloudWatch: Fix for dimension value list when changing dimension key.
Graphite: Editing function arguments now works again.
InfluxDB: Fix tag names with periods in alert evaluation.
PngRendering: Fix for panel height & title centering .
Templating: Fix for editing query variables.
diffstat:
www/grafana/Makefile | 66 +-
www/grafana/PLIST | 1371 ++++++++++++++++++++++++++++++++---------
www/grafana/distinfo | 18 +-
www/grafana/files/grafana.sh | 4 +-
4 files changed, 1106 insertions(+), 353 deletions(-)
diffs (truncated from 1970 to 300 lines):
diff -r 7be5604c2138 -r 06e100484a6b www/grafana/Makefile
--- a/www/grafana/Makefile Tue May 21 08:26:39 2019 +0000
+++ b/www/grafana/Makefile Tue May 21 08:32:04 2019 +0000
@@ -1,42 +1,34 @@
-# $NetBSD: Makefile,v 1.10 2018/09/22 20:52:17 bsiegert Exp $
+# $NetBSD: Makefile,v 1.11 2019/05/21 08:32:04 adam Exp $
-GITHUB_PROJECT= grafana
-DISTNAME= grafana-4.6.2
+DISTNAME= grafana-6.1.6
GITHUB_TAG= v${PKGVERSION_NOREV}
-PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=grafana/}
-EXTRACT_SUFX= .tar.gz # don't delete this, needed for variable expansion
MAINTAINER= tnn%NetBSD.org@localhost
HOMEPAGE= https://grafana.com/
COMMENT= Metrics dashboard and graph editor
LICENSE= apache-2.0
-GR_DISTNAME= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES= ${GR_DISTNAME}
-EXTRACT_ONLY= ${GR_DISTNAME}
-EXTRACT_DIR.${GR_DISTNAME}= ${WRKDIR}/src/github.com/grafana
-WRKSRC= ${WRKDIR}/src/github.com/grafana/grafana
+DISTFILES= ${DEFAULT_DISTFILES}
# We don't have suitable infrastructure in pkgsrc for generating frontend
# assets, so we'll extract prebuilt frontend assets.
-FE_DISTNAME= ${DISTNAME}.linux-x64${EXTRACT_SUFX}
-SITES.${FE_DISTNAME}= https://s3-us-west-2.amazonaws.com/grafana-releases/release/
+FE_DISTNAME= ${DISTNAME}.linux-amd64.tar.gz
DISTFILES+= ${FE_DISTNAME}
-EXTRACT_ONLY+= ${FE_DISTNAME}
-EXTRACT_DIR.${FE_DISTNAME}= ${WRKDIR}/frontend_assets
+SITES.${FE_DISTNAME}= https://dl.grafana.com/oss/release/
+EXTRACT_DIR.${FE_DISTNAME}= ${WRKDIR}/linux
-.include "../../lang/go/version.mk"
+GO_DIST_BASE= ${DISTNAME}
+GO_SRCPATH= github.com/grafana/grafana
-BUILD_DEPENDS+= ${GO_PACKAGE_DEP}
+#BUILD_DEPENDS+= yarn>=1.15.0:../../devel/yarn
CHECK_PORTABILITY_SKIP= packaging/rpm/control/postinst
CHECK_RELRO_SKIP+= bin/grafana-cli
CHECK_RELRO_SKIP+= bin/grafana-server
-PKGSRC_MAKE_ENV+= GOPATH=${WRKDIR}
USE_TOOLS+= pax
PUBLICDIR= ${PREFIX}/share/grafana/public
@@ -58,6 +50,8 @@
FILES_SUBST+= GRAFANA_GROUP=${GRAFANA_GROUP:Q}
FILES_SUBST+= DATADIR=${DATADIR:Q}
+.include "../../mk/bsd.prefs.mk"
+
GRAFANA_USER?= grafana
GRAFANA_GROUP?= grafana
OWN_DIRS_PERMS+= ${DATADIR} ${GRAFANA_USER} ${GRAFANA_GROUP} 0700
@@ -69,33 +63,23 @@
PKG_USERS= ${GRAFANA_USER}:${GRAFANA_GROUP}
RCD_SCRIPTS= grafana
-INSTALLATION_DIRS+= bin share/examples/grafana share/grafana/conf \
- share/grafana/public
-
-CONF_FILES+= ${PREFIX}/share/grafana/conf/sample.ini \
- ${PKG_SYSCONFDIR}/grafana.conf
+INSTALLATION_DIRS+= bin share/examples/grafana share/grafana/conf \
+ share/grafana/public
-post-extract:
- ${MV} ${WRKDIR}/src/github.com/grafana/${DISTNAME} \
- ${WRKDIR}/src/github.com/grafana/grafana
+CONF_FILES+= ${PREFIX}/share/grafana/conf/sample.ini \
+ ${PKG_SYSCONFDIR}/grafana.conf
-do-build:
-.for b in grafana-server grafana-cli
- cd ${WRKSRC} && ${SETENV} ${PKGSRC_MAKE_ENV} \
- ${GO} build -ldflags "-w -X main.version=${PKGVERSION_NOREV} -X main.commit=${GITHUB_TAG} -X main.buildstamp=pkgsrc" \
- -o ./bin/${b} ./pkg/cmd/${b}
-.endfor
+#post-build:
+# cd ${WRKSRC} && yarn install --pure-lockfile && yarn build
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/grafana-server \
- ${DESTDIR}${PREFIX}/bin/grafana-server
- ${INSTALL_PROGRAM} ${WRKSRC}//bin/grafana-cli \
- ${DESTDIR}${PREFIX}/bin/grafana-cli
- cd ${WRKDIR}/frontend_assets/${DISTNAME}/public && \
- ${PAX} -rw . ${DESTDIR}${PUBLICDIR}
- ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
- ${DESTDIR}${PREFIX}/share/grafana/conf/defaults.ini
- ${INSTALL_DATA} ${WRKSRC}/conf/sample.ini \
- ${DESTDIR}${PREFIX}/share/grafana/conf/sample.ini
+ cd ${WRKDIR} && ${PAX} -rw bin ${DESTDIR}${PREFIX}
+ cd ${WRKDIR}/linux/${DISTNAME}/public && \
+ ${PAX} -rw . ${DESTDIR}${PUBLICDIR}
+ ${INSTALL_DATA} ${WRKSRC}/conf/defaults.ini \
+ ${DESTDIR}${PREFIX}/share/grafana/conf/defaults.ini
+ ${INSTALL_DATA} ${WRKSRC}/conf/sample.ini \
+ ${DESTDIR}${PREFIX}/share/grafana/conf/sample.ini
+.include "../../lang/go/go-package.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 7be5604c2138 -r 06e100484a6b www/grafana/PLIST
--- a/www/grafana/PLIST Tue May 21 08:26:39 2019 +0000
+++ b/www/grafana/PLIST Tue May 21 08:32:04 2019 +0000
@@ -1,22 +1,67 @@
-@comment $NetBSD: PLIST,v 1.2 2017/11/27 16:04:54 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/05/21 08:32:04 adam Exp $
+bin/alert_webhook_listener
bin/grafana-cli
bin/grafana-server
+bin/release_publisher
share/grafana/conf/defaults.ini
share/grafana/conf/sample.ini
share/grafana/public/app/app.ts
+share/grafana/public/app/core/actions/appNotification.ts
+share/grafana/public/app/core/actions/index.ts
+share/grafana/public/app/core/actions/location.ts
+share/grafana/public/app/core/actions/navModel.ts
+share/grafana/public/app/core/angular_wrappers.ts
share/grafana/public/app/core/app_events.ts
+share/grafana/public/app/core/components/AlertBox/AlertBox.tsx
+share/grafana/public/app/core/components/Animations/FadeIn.tsx
+share/grafana/public/app/core/components/Animations/SlideDown.tsx
+share/grafana/public/app/core/components/AppNotifications/AppNotificationItem.tsx
+share/grafana/public/app/core/components/AppNotifications/AppNotificationList.tsx
+share/grafana/public/app/core/components/ClickOutsideWrapper/ClickOutsideWrapper.tsx
+share/grafana/public/app/core/components/CopyToClipboard/CopyToClipboard.tsx
+share/grafana/public/app/core/components/EmptyListCTA/EmptyListCTA.test.tsx
+share/grafana/public/app/core/components/EmptyListCTA/EmptyListCTA.tsx
+share/grafana/public/app/core/components/EmptyListCTA/__snapshots__/EmptyListCTA.test.tsx.snap
+share/grafana/public/app/core/components/ErrorBoundary/ErrorBoundary.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/JSONFormatter/JSONFormatter.tsx
+share/grafana/public/app/core/components/LayoutSelector/LayoutSelector.tsx
+share/grafana/public/app/core/components/OrgActionBar/OrgActionBar.test.tsx
+share/grafana/public/app/core/components/OrgActionBar/OrgActionBar.tsx
+share/grafana/public/app/core/components/OrgActionBar/__snapshots__/OrgActionBar.test.tsx.snap
+share/grafana/public/app/core/components/Page/Page.tsx
+share/grafana/public/app/core/components/Page/PageContents.tsx
+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/PasswordStrength.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/Select/DataSourcePicker.tsx
+share/grafana/public/app/core/components/Select/MetricSelect.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
+share/grafana/public/app/core/components/Select/UserPicker.tsx
+share/grafana/public/app/core/components/Select/__snapshots__/TeamPicker.test.tsx.snap
+share/grafana/public/app/core/components/Select/__snapshots__/UserPicker.test.tsx.snap
+share/grafana/public/app/core/components/SharedPreferences/SharedPreferences.tsx
+share/grafana/public/app/core/components/TagFilter/TagBadge.tsx
+share/grafana/public/app/core/components/TagFilter/TagFilter.tsx
+share/grafana/public/app/core/components/TagFilter/TagOption.tsx
+share/grafana/public/app/core/components/TagFilter/TagValue.tsx
+share/grafana/public/app/core/components/ToggleButtonGroup/ToggleButtonGroup.tsx
+share/grafana/public/app/core/components/WithFeatureToggle.tsx
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/ColorPalette.tsx
-share/grafana/public/app/core/components/colorpicker/ColorPicker.tsx
-share/grafana/public/app/core/components/colorpicker/ColorPickerPopover.tsx
-share/grafana/public/app/core/components/colorpicker/SeriesColorPicker.tsx
-share/grafana/public/app/core/components/colorpicker/SpectrumPicker.tsx
share/grafana/public/app/core/components/colorpicker/spectrum_picker.ts
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/grafana_app.ts
share/grafana/public/app/core/components/help/help.html
share/grafana/public/app/core/components/help/help.ts
share/grafana/public/app/core/components/info_popover.ts
@@ -24,89 +69,177 @@
share/grafana/public/app/core/components/json_explorer/json_explorer.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/navbar/navbar.html
share/grafana/public/app/core/components/navbar/navbar.ts
+share/grafana/public/app/core/components/org_switcher.ts
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/SearchResult.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/sidemenu/sidemenu.html
-share/grafana/public/app/core/components/sidemenu/sidemenu.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
+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__/SideMenu.test.tsx.snap
+share/grafana/public/app/core/components/sidemenu/__snapshots__/SideMenuDropDown.test.tsx.snap
+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/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.js
-share/grafana/public/app/core/controllers/all.js
-share/grafana/public/app/core/controllers/error_ctrl.js
-share/grafana/public/app/core/controllers/inspect_ctrl.js
-share/grafana/public/app/core/controllers/invited_ctrl.js
-share/grafana/public/app/core/controllers/json_editor_ctrl.js
-share/grafana/public/app/core/controllers/login_ctrl.js
-share/grafana/public/app/core/controllers/reset_password_ctrl.js
+share/grafana/public/app/core/config.ts
+share/grafana/public/app/core/constants.ts
+share/grafana/public/app/core/controllers/all.ts
+share/grafana/public/app/core/controllers/error_ctrl.ts
+share/grafana/public/app/core/controllers/invited_ctrl.ts
+share/grafana/public/app/core/controllers/json_editor_ctrl.ts
+share/grafana/public/app/core/controllers/login_ctrl.ts
+share/grafana/public/app/core/controllers/reset_password_ctrl.ts
share/grafana/public/app/core/controllers/signup_ctrl.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/directives/array_join.ts
-share/grafana/public/app/core/directives/confirm_click.js
-share/grafana/public/app/core/directives/dash_class.js
-share/grafana/public/app/core/directives/dash_edit_link.js
+share/grafana/public/app/core/directives/autofill_event_fix.ts
share/grafana/public/app/core/directives/diff-view.ts
-share/grafana/public/app/core/directives/dropdown_typeahead.js
+share/grafana/public/app/core/directives/dropdown_typeahead.ts
share/grafana/public/app/core/directives/give_focus.ts
-share/grafana/public/app/core/directives/metric_segment.js
-share/grafana/public/app/core/directives/misc.js
-share/grafana/public/app/core/directives/ng_model_on_blur.js
+share/grafana/public/app/core/directives/metric_segment.ts
+share/grafana/public/app/core/directives/misc.ts
+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.js
-share/grafana/public/app/core/directives/value_select_dropdown.js
+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/jquery_extended.js
+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
-share/grafana/public/app/core/lodash_extended.js
+share/grafana/public/app/core/lodash_extended.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/partials.ts
share/grafana/public/app/core/profiler.ts
-share/grafana/public/app/core/routes/bundle_loader.ts
-share/grafana/public/app/core/routes/dashboard_loaders.js
-share/grafana/public/app/core/routes/routes.ts
+share/grafana/public/app/core/reducers/appNotification.test.ts
+share/grafana/public/app/core/reducers/appNotification.ts
+share/grafana/public/app/core/reducers/index.ts
+share/grafana/public/app/core/reducers/location.ts
+share/grafana/public/app/core/reducers/navModel.ts
+share/grafana/public/app/core/reducers/processsAclItems.ts
+share/grafana/public/app/core/redux/actionCreatorFactory.test.ts
+share/grafana/public/app/core/redux/actionCreatorFactory.ts
+share/grafana/public/app/core/redux/index.ts
Home |
Main Index |
Thread Index |
Old Index