CVS commit: pkgsrc/www/grafana

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jun  6 16:09:20 UTC 2019

Modified Files:
        pkgsrc/www/grafana: Makefile PLIST distinfo
        pkgsrc/www/grafana/files: grafana.sh

Log Message:
grafana: updated to 6.2.2

6.2.2:
Features / Enhancements
Security: Prevent CSV formula injection attack when exporting data.

Bug Fixes
CloudWatch: Fixes error when hiding/disabling queries.
Database: Fixed slow permission query in folder/dashboard search.
Explore: Fixed updating time range before running queries.
Plugins: Fixed plugin config page navigation when using subpath.

6.2.1:
Features / Enhancements
CLI: Add command to migrate all datasources to use encrypted password fields.
Gauge/BarGauge: Improvements to auto value font size.

Bug Fixes
Auth Proxy: Resolve database is locked errors.
Database: Retry transaction if sqlite returns database is locked error.
Explore: Fixes so clicking in a Prometheus Table the query is filtered by clicked value.
Singlestat: Fixes issue with value placement and line wraps.
Tech: Update jQuery to 3.4.1 to fix issue on iOS 10 based browers as well as Chrome 53.x.

6.2.0:
Bug Fixes
BarGauge: Fix for negative min values.
Gauge/BarGauge: Fix for issues editing min & max options.
Search: Make only folder name only open search with current folder filter.
AzureMonitor: Revert to clearing chained dropdowns.

Breaking Changes
Plugins: Data source plugins that process hidden queries need to add a “hiddenQueries: true” attribute in plugin.json.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/grafana/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/grafana/PLIST pkgsrc/www/grafana/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/grafana/files/grafana.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/grafana/Makefile
diff -u pkgsrc/www/grafana/Makefile:1.12 pkgsrc/www/grafana/Makefile:1.13
--- pkgsrc/www/grafana/Makefile:1.12    Mon May 27 15:18:33 2019
+++ pkgsrc/www/grafana/Makefile Thu Jun  6 16:09:19 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2019/05/27 15:18:33 bsiegert Exp $
+# $NetBSD: Makefile,v 1.13 2019/06/06 16:09:19 adam Exp $
 
-DISTNAME=      grafana-6.1.6
-GITHUB_TAG=    v${PKGVERSION_NOREV}
-PKGREVISION=   1
+DISTNAME=      grafana-6.2.2
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=grafana/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    tnn%NetBSD.org@localhost
 HOMEPAGE=      https://grafana.com/
@@ -64,8 +63,9 @@ PKG_GROUPS=           ${GRAFANA_GROUP}
 PKG_USERS=             ${GRAFANA_USER}:${GRAFANA_GROUP}
 RCD_SCRIPTS=           grafana
 
-INSTALLATION_DIRS+=    bin share/examples/grafana share/grafana/conf \
-                       share/grafana/public
+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
@@ -77,10 +77,8 @@ do-install:
        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
+       cd ${WRKSRC} && ${PAX} -rw conf \
+               ${DESTDIR}${PREFIX}/share/grafana/
 
 .include "../../lang/go/go-package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/grafana/PLIST
diff -u pkgsrc/www/grafana/PLIST:1.3 pkgsrc/www/grafana/PLIST:1.4
--- pkgsrc/www/grafana/PLIST:1.3        Tue May 21 08:32:04 2019
+++ pkgsrc/www/grafana/PLIST    Thu Jun  6 16:09:19 2019
@@ -1,9 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2019/05/21 08:32:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/06/06 16:09:19 adam Exp $
 bin/alert_webhook_listener
 bin/grafana-cli
 bin/grafana-server
 bin/release_publisher
 share/grafana/conf/defaults.ini
+share/grafana/conf/ldap.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/sample.ini
 share/grafana/public/app/app.ts
 share/grafana/public/app/core/actions/appNotification.ts
@@ -17,11 +21,8 @@ share/grafana/public/app/core/components
 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
@@ -77,6 +78,7 @@ share/grafana/public/app/core/components
 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/SearchResult.tsx
 share/grafana/public/app/core/components/search/search.html
 share/grafana/public/app/core/components/search/search.ts
@@ -174,7 +176,6 @@ share/grafana/public/app/core/services/t
 share/grafana/public/app/core/services/util_srv.ts
 share/grafana/public/app/core/specs/PasswordStrength.test.tsx
 share/grafana/public/app/core/specs/backend_srv.test.ts
-share/grafana/public/app/core/specs/datemath.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
@@ -204,7 +205,6 @@ share/grafana/public/app/core/utils/conn
 share/grafana/public/app/core/utils/css_loader.ts
 share/grafana/public/app/core/utils/dag.test.ts
 share/grafana/public/app/core/utils/dag.ts
-share/grafana/public/app/core/utils/datemath.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
@@ -219,7 +219,6 @@ share/grafana/public/app/core/utils/mode
 share/grafana/public/app/core/utils/outline.ts
 share/grafana/public/app/core/utils/query.test.ts
 share/grafana/public/app/core/utils/query.ts
-share/grafana/public/app/core/utils/rangeutil.ts
 share/grafana/public/app/core/utils/react2angular.ts
 share/grafana/public/app/core/utils/reselect.ts
 share/grafana/public/app/core/utils/scrollbar.ts
@@ -318,6 +317,7 @@ share/grafana/public/app/features/dashbo
 share/grafana/public/app/features/dashboard/components/DashLinks/index.ts
 share/grafana/public/app/features/dashboard/components/DashNav/DashNav.tsx
 share/grafana/public/app/features/dashboard/components/DashNav/DashNavButton.tsx
+share/grafana/public/app/features/dashboard/components/DashNav/DashNavTimeControls.tsx
 share/grafana/public/app/features/dashboard/components/DashNav/index.ts
 share/grafana/public/app/features/dashboard/components/DashboardPermissions/DashboardPermissions.tsx
 share/grafana/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx
@@ -370,11 +370,9 @@ share/grafana/public/app/features/dashbo
 share/grafana/public/app/features/dashboard/containers/DashboardPage.tsx
 share/grafana/public/app/features/dashboard/containers/SoloPanelPage.tsx
 share/grafana/public/app/features/dashboard/containers/__snapshots__/DashboardPage.test.tsx.snap
+share/grafana/public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx
 share/grafana/public/app/features/dashboard/dashgrid/DashboardGrid.tsx
-share/grafana/public/app/features/dashboard/dashgrid/DashboardGridDirective.ts
 share/grafana/public/app/features/dashboard/dashgrid/DashboardPanel.tsx
-share/grafana/public/app/features/dashboard/dashgrid/DataPanel.test.tsx
-share/grafana/public/app/features/dashboard/dashgrid/DataPanel.tsx
 share/grafana/public/app/features/dashboard/dashgrid/PanelChrome.test.tsx
 share/grafana/public/app/features/dashboard/dashgrid/PanelChrome.tsx
 share/grafana/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
@@ -383,12 +381,14 @@ share/grafana/public/app/features/dashbo
 share/grafana/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem.tsx
 share/grafana/public/app/features/dashboard/dashgrid/PanelPluginNotFound.tsx
 share/grafana/public/app/features/dashboard/dashgrid/PanelResizer.tsx
+share/grafana/public/app/features/dashboard/dashgrid/__snapshots__/DashboardGrid.test.tsx.snap
 share/grafana/public/app/features/dashboard/index.ts
 share/grafana/public/app/features/dashboard/panel_editor/DataSourceOption.tsx
 share/grafana/public/app/features/dashboard/panel_editor/EditorTabBody.tsx
 share/grafana/public/app/features/dashboard/panel_editor/GeneralTab.tsx
 share/grafana/public/app/features/dashboard/panel_editor/PanelEditor.tsx
 share/grafana/public/app/features/dashboard/panel_editor/QueriesTab.tsx
+share/grafana/public/app/features/dashboard/panel_editor/QueryEditorRow.test.ts
 share/grafana/public/app/features/dashboard/panel_editor/QueryEditorRow.tsx
 share/grafana/public/app/features/dashboard/panel_editor/QueryInspector.tsx
 share/grafana/public/app/features/dashboard/panel_editor/QueryOptions.tsx
@@ -410,6 +410,10 @@ share/grafana/public/app/features/dashbo
 share/grafana/public/app/features/dashboard/state/DashboardModel.ts
 share/grafana/public/app/features/dashboard/state/PanelModel.test.ts
 share/grafana/public/app/features/dashboard/state/PanelModel.ts
+share/grafana/public/app/features/dashboard/state/PanelQueryRunner.test.ts
+share/grafana/public/app/features/dashboard/state/PanelQueryRunner.ts
+share/grafana/public/app/features/dashboard/state/PanelQueryState.test.ts
+share/grafana/public/app/features/dashboard/state/PanelQueryState.ts
 share/grafana/public/app/features/dashboard/state/actions.ts
 share/grafana/public/app/features/dashboard/state/index.ts
 share/grafana/public/app/features/dashboard/state/initDashboard.test.ts
@@ -456,6 +460,8 @@ share/grafana/public/app/features/dataso
 share/grafana/public/app/features/datasources/state/reducers.test.ts
 share/grafana/public/app/features/datasources/state/reducers.ts
 share/grafana/public/app/features/datasources/state/selectors.ts
+share/grafana/public/app/features/datasources/utils/passwordHandlers.test.ts
+share/grafana/public/app/features/datasources/utils/passwordHandlers.ts
 share/grafana/public/app/features/explore/ElapsedTime.tsx
 share/grafana/public/app/features/explore/Error.tsx
 share/grafana/public/app/features/explore/ErrorBoundary.tsx
@@ -474,6 +480,7 @@ share/grafana/public/app/features/explor
 share/grafana/public/app/features/explore/LogRow.tsx
 share/grafana/public/app/features/explore/Logs.tsx
 share/grafana/public/app/features/explore/LogsContainer.tsx
+share/grafana/public/app/features/explore/NoDataSourceCallToAction.tsx
 share/grafana/public/app/features/explore/Panel.tsx
 share/grafana/public/app/features/explore/PlaceholdersBuffer.test.ts
 share/grafana/public/app/features/explore/PlaceholdersBuffer.ts
@@ -487,6 +494,8 @@ share/grafana/public/app/features/explor
 share/grafana/public/app/features/explore/TimePicker.test.tsx
 share/grafana/public/app/features/explore/TimePicker.tsx
 share/grafana/public/app/features/explore/Typeahead.tsx
+share/grafana/public/app/features/explore/TypeaheadInfo.tsx
+share/grafana/public/app/features/explore/TypeaheadItem.tsx
 share/grafana/public/app/features/explore/Value.ts
 share/grafana/public/app/features/explore/Wrapper.tsx
 share/grafana/public/app/features/explore/__mocks__/mockData.ts
@@ -509,6 +518,7 @@ share/grafana/public/app/features/explor
 share/grafana/public/app/features/explore/utils/dom.ts
 share/grafana/public/app/features/explore/utils/set.test.ts
 share/grafana/public/app/features/explore/utils/set.ts
+share/grafana/public/app/features/explore/utils/typeahead.ts
 share/grafana/public/app/features/folders/CreateFolderCtrl.ts
 share/grafana/public/app/features/folders/FolderDashboardsCtrl.ts
 share/grafana/public/app/features/folders/FolderPermissions.tsx
@@ -580,12 +590,17 @@ share/grafana/public/app/features/playli
 share/grafana/public/app/features/playlist/playlists_ctrl.ts
 share/grafana/public/app/features/playlist/specs/playlist_edit_ctrl.test.ts
 share/grafana/public/app/features/playlist/specs/playlist_srv.test.ts
+share/grafana/public/app/features/plugins/AppRootPage.tsx
+share/grafana/public/app/features/plugins/PluginDashboards.tsx
 share/grafana/public/app/features/plugins/PluginList.test.tsx
 share/grafana/public/app/features/plugins/PluginList.tsx
 share/grafana/public/app/features/plugins/PluginListItem.test.tsx
 share/grafana/public/app/features/plugins/PluginListItem.tsx
 share/grafana/public/app/features/plugins/PluginListPage.test.tsx
 share/grafana/public/app/features/plugins/PluginListPage.tsx
+share/grafana/public/app/features/plugins/PluginPage.tsx
+share/grafana/public/app/features/plugins/PluginSettingsCache.ts
+share/grafana/public/app/features/plugins/PluginStateInfo.tsx
 share/grafana/public/app/features/plugins/__mocks__/pluginMocks.ts
 share/grafana/public/app/features/plugins/__snapshots__/PluginList.test.tsx.snap
 share/grafana/public/app/features/plugins/__snapshots__/PluginListItem.test.tsx.snap
@@ -593,22 +608,18 @@ share/grafana/public/app/features/plugin
 share/grafana/public/app/features/plugins/all.ts
 share/grafana/public/app/features/plugins/built_in_plugins.ts
 share/grafana/public/app/features/plugins/datasource_srv.ts
-share/grafana/public/app/features/plugins/import_list/import_list.html
-share/grafana/public/app/features/plugins/import_list/import_list.ts
-share/grafana/public/app/features/plugins/partials/plugin_edit.html
 share/grafana/public/app/features/plugins/partials/plugin_page.html
 share/grafana/public/app/features/plugins/partials/update_instructions.html
 share/grafana/public/app/features/plugins/plugin_component.ts
-share/grafana/public/app/features/plugins/plugin_edit_ctrl.ts
 share/grafana/public/app/features/plugins/plugin_loader.ts
 share/grafana/public/app/features/plugins/plugin_page_ctrl.ts
 share/grafana/public/app/features/plugins/specs/datasource_srv.test.ts
 share/grafana/public/app/features/plugins/state/actions.ts
-share/grafana/public/app/features/plugins/state/navModel.ts
 share/grafana/public/app/features/plugins/state/reducers.ts
 share/grafana/public/app/features/plugins/state/selectors.test.ts
 share/grafana/public/app/features/plugins/state/selectors.ts
 share/grafana/public/app/features/plugins/variableQueryEditorLoader.tsx
+share/grafana/public/app/features/plugins/wrappers/AppConfigWrapper.tsx
 share/grafana/public/app/features/profile/ChangePasswordCtrl.ts
 share/grafana/public/app/features/profile/PrefControlCtrl.ts
 share/grafana/public/app/features/profile/ProfileCtrl.ts
@@ -616,6 +627,7 @@ share/grafana/public/app/features/profil
 share/grafana/public/app/features/profile/partials/change_password.html
 share/grafana/public/app/features/profile/partials/profile.html
 share/grafana/public/app/features/profile/state/reducers.ts
+share/grafana/public/app/features/profile/state/selectors.ts
 share/grafana/public/app/features/teams/CreateTeamCtrl.ts
 share/grafana/public/app/features/teams/TeamGroupSync.test.tsx
 share/grafana/public/app/features/teams/TeamGroupSync.tsx
@@ -692,6 +704,19 @@ share/grafana/public/app/partials/reset_
 share/grafana/public/app/partials/signup_invited.html
 share/grafana/public/app/partials/signup_step2.html
 share/grafana/public/app/partials/valueSelectDropdown.html
+share/grafana/public/app/plugins/app/example-app/ExampleRootPage.tsx
+share/grafana/public/app/plugins/app/example-app/README.md
+share/grafana/public/app/plugins/app/example-app/config/ExampleTab1.tsx
+share/grafana/public/app/plugins/app/example-app/config/ExampleTab2.tsx
+share/grafana/public/app/plugins/app/example-app/dashboards/stats.json
+share/grafana/public/app/plugins/app/example-app/dashboards/streaming.json
+share/grafana/public/app/plugins/app/example-app/img/logo.png
+share/grafana/public/app/plugins/app/example-app/legacy/angular_example_page.html
+share/grafana/public/app/plugins/app/example-app/legacy/angular_example_page.ts
+share/grafana/public/app/plugins/app/example-app/legacy/config.html
+share/grafana/public/app/plugins/app/example-app/legacy/config.ts
+share/grafana/public/app/plugins/app/example-app/module.ts
+share/grafana/public/app/plugins/app/example-app/plugin.json
 share/grafana/public/app/plugins/datasource/cloudwatch/README.md
 share/grafana/public/app/plugins/datasource/cloudwatch/config_ctrl.ts
 share/grafana/public/app/plugins/datasource/cloudwatch/datasource.d.ts
@@ -706,6 +731,7 @@ share/grafana/public/app/plugins/datasou
 share/grafana/public/app/plugins/datasource/cloudwatch/query_ctrl.ts
 share/grafana/public/app/plugins/datasource/cloudwatch/query_parameter_ctrl.ts
 share/grafana/public/app/plugins/datasource/cloudwatch/specs/datasource.test.ts
+share/grafana/public/app/plugins/datasource/cloudwatch/types.ts
 share/grafana/public/app/plugins/datasource/elasticsearch/README.md
 share/grafana/public/app/plugins/datasource/elasticsearch/bucket_agg.ts
 share/grafana/public/app/plugins/datasource/elasticsearch/config_ctrl.ts
@@ -782,6 +808,7 @@ share/grafana/public/app/plugins/datasou
 share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/query_help.md
 share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.test.ts
 share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/time_grain_converter.ts
+share/grafana/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts
 share/grafana/public/app/plugins/datasource/grafana-live/_plugin.json
 share/grafana/public/app/plugins/datasource/grafana-live/datasource.ts
 share/grafana/public/app/plugins/datasource/grafana-live/module.ts
@@ -841,6 +868,15 @@ share/grafana/public/app/plugins/datasou
 share/grafana/public/app/plugins/datasource/influxdb/specs/query_ctrl.test.ts
 share/grafana/public/app/plugins/datasource/influxdb/specs/query_part.test.ts
 share/grafana/public/app/plugins/datasource/influxdb/specs/response_parser.test.ts
+share/grafana/public/app/plugins/datasource/input/InputConfigEditor.tsx
+share/grafana/public/app/plugins/datasource/input/InputDatasource.test.ts
+share/grafana/public/app/plugins/datasource/input/InputDatasource.ts
+share/grafana/public/app/plugins/datasource/input/InputQueryEditor.tsx
+share/grafana/public/app/plugins/datasource/input/README.md
+share/grafana/public/app/plugins/datasource/input/img/input.svg
+share/grafana/public/app/plugins/datasource/input/module.ts
+share/grafana/public/app/plugins/datasource/input/plugin.json
+share/grafana/public/app/plugins/datasource/input/types.ts
 share/grafana/public/app/plugins/datasource/loki/README.md
 share/grafana/public/app/plugins/datasource/loki/components/LokiCheatSheet.tsx
 share/grafana/public/app/plugins/datasource/loki/components/LokiQueryEditor.tsx
@@ -1004,9 +1040,12 @@ share/grafana/public/app/plugins/datasou
 share/grafana/public/app/plugins/datasource/stackdriver/specs/query_filter_ctrl.test.ts
 share/grafana/public/app/plugins/datasource/stackdriver/specs/testData.ts
 share/grafana/public/app/plugins/datasource/stackdriver/types.ts
+share/grafana/public/app/plugins/datasource/testdata/ConfigEditor.tsx
 share/grafana/public/app/plugins/datasource/testdata/QueryEditor.tsx
+share/grafana/public/app/plugins/datasource/testdata/StreamHandler.ts
+share/grafana/public/app/plugins/datasource/testdata/dashboards/streaming.json
 share/grafana/public/app/plugins/datasource/testdata/datasource.ts
-share/grafana/public/app/plugins/datasource/testdata/module.ts
+share/grafana/public/app/plugins/datasource/testdata/module.tsx
 share/grafana/public/app/plugins/datasource/testdata/partials/query.editor.html
 share/grafana/public/app/plugins/datasource/testdata/plugin.json
 share/grafana/public/app/plugins/datasource/testdata/query_ctrl.ts
@@ -1029,17 +1068,18 @@ share/grafana/public/app/plugins/panel/d
 share/grafana/public/app/plugins/panel/dashlist/module.html
 share/grafana/public/app/plugins/panel/dashlist/module.ts
 share/grafana/public/app/plugins/panel/dashlist/plugin.json
-share/grafana/public/app/plugins/panel/gauge/GaugeOptionsBox.tsx
+share/grafana/public/app/plugins/panel/gauge/GaugeMigrations.test.ts
+share/grafana/public/app/plugins/panel/gauge/GaugeMigrations.ts
 share/grafana/public/app/plugins/panel/gauge/GaugePanel.tsx
 share/grafana/public/app/plugins/panel/gauge/GaugePanelEditor.tsx
+share/grafana/public/app/plugins/panel/gauge/__snapshots__/GaugeMigrations.test.ts.snap
 share/grafana/public/app/plugins/panel/gauge/img/icon_gauge.svg
 share/grafana/public/app/plugins/panel/gauge/module.tsx
 share/grafana/public/app/plugins/panel/gauge/plugin.json
 share/grafana/public/app/plugins/panel/gauge/types.ts
+share/grafana/public/app/plugins/panel/gettingstarted/GettingStarted.tsx
 share/grafana/public/app/plugins/panel/gettingstarted/README.md
-share/grafana/public/app/plugins/panel/gettingstarted/editor.html
 share/grafana/public/app/plugins/panel/gettingstarted/img/icn-dashlist-panel.svg
-share/grafana/public/app/plugins/panel/gettingstarted/module.html
 share/grafana/public/app/plugins/panel/gettingstarted/module.ts
 share/grafana/public/app/plugins/panel/gettingstarted/plugin.json
 share/grafana/public/app/plugins/panel/graph/Legend/Legend.tsx
@@ -1077,9 +1117,12 @@ share/grafana/public/app/plugins/panel/g
 share/grafana/public/app/plugins/panel/graph/time_region_manager.ts
 share/grafana/public/app/plugins/panel/graph/time_regions_form.html
 share/grafana/public/app/plugins/panel/graph/time_regions_form.ts
+share/grafana/public/app/plugins/panel/graph2/GraphLegendEditor.tsx
 share/grafana/public/app/plugins/panel/graph2/GraphPanel.tsx
+share/grafana/public/app/plugins/panel/graph2/GraphPanelController.tsx
 share/grafana/public/app/plugins/panel/graph2/GraphPanelEditor.tsx
 share/grafana/public/app/plugins/panel/graph2/README.md
+share/grafana/public/app/plugins/panel/graph2/getGraphSeriesModel.ts
 share/grafana/public/app/plugins/panel/graph2/img/icn-graph-panel.svg
 share/grafana/public/app/plugins/panel/graph2/module.tsx
 share/grafana/public/app/plugins/panel/graph2/plugin.json
@@ -1123,11 +1166,12 @@ share/grafana/public/app/plugins/panel/s
 share/grafana/public/app/plugins/panel/singlestat/plugin.json
 share/grafana/public/app/plugins/panel/singlestat/specs/singlestat.test.ts
 share/grafana/public/app/plugins/panel/singlestat/specs/singlestat_panel.test.ts
-share/grafana/public/app/plugins/panel/singlestat2/ProcessedValuesRepeater.tsx
+share/grafana/public/app/plugins/panel/singlestat2/ColoringEditor.tsx
+share/grafana/public/app/plugins/panel/singlestat2/FontSizeEditor.tsx
 share/grafana/public/app/plugins/panel/singlestat2/README.md
 share/grafana/public/app/plugins/panel/singlestat2/SingleStatEditor.tsx
 share/grafana/public/app/plugins/panel/singlestat2/SingleStatPanel.tsx
-share/grafana/public/app/plugins/panel/singlestat2/SingleStatValueEditor.tsx
+share/grafana/public/app/plugins/panel/singlestat2/SparklineEditor.tsx
 share/grafana/public/app/plugins/panel/singlestat2/img/icn-singlestat-panel.svg
 share/grafana/public/app/plugins/panel/singlestat2/module.tsx
 share/grafana/public/app/plugins/panel/singlestat2/plugin.json
@@ -1184,7 +1228,6 @@ share/grafana/public/app/types/folders.t
 share/grafana/public/app/types/index.ts
 share/grafana/public/app/types/jquery/jquery.d.ts
 share/grafana/public/app/types/location.ts
-share/grafana/public/app/types/navModel.ts
 share/grafana/public/app/types/organization.ts
 share/grafana/public/app/types/plugins.ts
 share/grafana/public/app/types/search.ts
@@ -1192,18 +1235,18 @@ share/grafana/public/app/types/store.ts
 share/grafana/public/app/types/teams.ts
 share/grafana/public/app/types/templates.ts
 share/grafana/public/app/types/user.ts
-share/grafana/public/build/app.e7f4da0898a00c92f24e.js
-share/grafana/public/build/app.e7f4da0898a00c92f24e.js.map
-share/grafana/public/build/dark.e7f4da0898a00c92f24e.js
-share/grafana/public/build/dark.e7f4da0898a00c92f24e.js.map
-share/grafana/public/build/explore.e7f4da0898a00c92f24e.js
-share/grafana/public/build/explore.e7f4da0898a00c92f24e.js.map
-share/grafana/public/build/grafana.dark.e7f4da0898a00c92f24e.css
-share/grafana/public/build/grafana.light.e7f4da0898a00c92f24e.css
-share/grafana/public/build/light.e7f4da0898a00c92f24e.js
-share/grafana/public/build/light.e7f4da0898a00c92f24e.js.map
-share/grafana/public/build/vendor.e7f4da0898a00c92f24e.js
-share/grafana/public/build/vendor.e7f4da0898a00c92f24e.js.map
+share/grafana/public/build/app.e20ad27c583c67dee67e.js
+share/grafana/public/build/app.e20ad27c583c67dee67e.js.map
+share/grafana/public/build/dark.e20ad27c583c67dee67e.js
+share/grafana/public/build/dark.e20ad27c583c67dee67e.js.map
+share/grafana/public/build/explore.e20ad27c583c67dee67e.js
+share/grafana/public/build/explore.e20ad27c583c67dee67e.js.map
+share/grafana/public/build/grafana.dark.e20ad27c583c67dee67e.css
+share/grafana/public/build/grafana.light.e20ad27c583c67dee67e.css
+share/grafana/public/build/light.e20ad27c583c67dee67e.js
+share/grafana/public/build/light.e20ad27c583c67dee67e.js.map
+share/grafana/public/build/vendor.e20ad27c583c67dee67e.js
+share/grafana/public/build/vendor.e20ad27c583c67dee67e.js.map
 share/grafana/public/dashboards/default.json
 share/grafana/public/dashboards/home.json
 share/grafana/public/dashboards/scripted.js
@@ -1513,6 +1556,7 @@ share/grafana/public/sass/components/_pa
 share/grafana/public/sass/components/_panel_editor.scss
 share/grafana/public/sass/components/_panel_gettingstarted.scss
 share/grafana/public/sass/components/_panel_graph.scss
+share/grafana/public/sass/components/_panel_header.scss
 share/grafana/public/sass/components/_panel_heatmap.scss
 share/grafana/public/sass/components/_panel_logs.scss
 share/grafana/public/sass/components/_panel_piechart.scss
@@ -1589,6 +1633,7 @@ share/grafana/public/test/mocks/angular.
 share/grafana/public/test/mocks/backend_srv.ts
 share/grafana/public/test/mocks/common.ts
 share/grafana/public/test/mocks/dashboard-mock.js
+share/grafana/public/test/mocks/datasource_srv.ts
 share/grafana/public/test/specs/helpers.ts
 share/grafana/public/vendor/angular-other/angular-strap.js
 share/grafana/public/vendor/angular-other/datepicker.js
Index: pkgsrc/www/grafana/distinfo
diff -u pkgsrc/www/grafana/distinfo:1.3 pkgsrc/www/grafana/distinfo:1.4
--- pkgsrc/www/grafana/distinfo:1.3     Tue May 21 08:32:04 2019
+++ pkgsrc/www/grafana/distinfo Thu Jun  6 16:09:19 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2019/05/21 08:32:04 adam Exp $
+$NetBSD: distinfo,v 1.4 2019/06/06 16:09:19 adam Exp $
 
-SHA1 (grafana-6.1.6.linux-amd64.tar.gz) = 9e94160405d46f9107f431b6eb76b8299ef80511
-RMD160 (grafana-6.1.6.linux-amd64.tar.gz) = 6491699efe0b8619844a80162d16d6de37aeb3eb
-SHA512 (grafana-6.1.6.linux-amd64.tar.gz) = b8851df5a00b752777c168446326603c5e00ed66e7217551c75a976961c9de1f5a5bf0d262068866ecd0dae685a09ac8829db2bb5201c32e1ecaed6bafc149e4
-Size (grafana-6.1.6.linux-amd64.tar.gz) = 56569580 bytes
-SHA1 (grafana-6.1.6.tar.gz) = 8617d8f37d343b6199e7aecc0dd2d8d5a77cc5f2
-RMD160 (grafana-6.1.6.tar.gz) = 365387cbd2297c600227aeda447b0e0872e9b640
-SHA512 (grafana-6.1.6.tar.gz) = 692eb13a7981e10cf3bea98a2054a1bb193b9bcdfae3630fcdb9f5f07bf1908e4e3898606f86a252edfd3bd36d41ae6dff1f467d602bd3f369ac9f98584911fb
-Size (grafana-6.1.6.tar.gz) = 12566846 bytes
+SHA1 (grafana-6.2.2.linux-amd64.tar.gz) = 172644a99ccb979c3480ea0bf0cf8c28d2817aa4
+RMD160 (grafana-6.2.2.linux-amd64.tar.gz) = 1bc7b2c84023e243d35bd261011ca8320c9bb71a
+SHA512 (grafana-6.2.2.linux-amd64.tar.gz) = 24a1f685a76b8bdf4876f498daf43ae316a8e6fc89dcc9d3aed67cfd360baff1cb48c1118753afcb845ddebbbebfa195d369036786e09b8ca00d78cb1f60e6f2
+Size (grafana-6.2.2.linux-amd64.tar.gz) = 58512782 bytes
+SHA1 (grafana-6.2.2.tar.gz) = 5714b94192991450fe8b370851c1f9dc1427eb3b
+RMD160 (grafana-6.2.2.tar.gz) = 01cadd843c72ed1c674cb63b79c2ce83e6643e72
+SHA512 (grafana-6.2.2.tar.gz) = fffa2a04c5249e6159297280313b7d6cbec2f86fc59e48200405905848dda524bb522cf34a1cf2f55855104e93c72e69284875f0dbea447cc8f551948c03e8af
+Size (grafana-6.2.2.tar.gz) = 13301416 bytes

Index: pkgsrc/www/grafana/files/grafana.sh
diff -u pkgsrc/www/grafana/files/grafana.sh:1.2 pkgsrc/www/grafana/files/grafana.sh:1.3
--- pkgsrc/www/grafana/files/grafana.sh:1.2     Tue May 21 08:32:04 2019
+++ pkgsrc/www/grafana/files/grafana.sh Thu Jun  6 16:09:20 2019
@@ -4,8 +4,7 @@
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-if [ -f /etc/rc.subr ]
-then
+if [ -f /etc/rc.subr ]; then
        . /etc/rc.subr
 fi
 
@@ -13,10 +12,36 @@ name="grafana"
 rcvar=$name
 grafana_user="@GRAFANA_USER@"
 grafana_group="@GRAFANA_GROUP@"
-grafana_chdir="@PREFIX@/share/grafana"
-pidfile="@VARBASE@/lib/grafana/data/grafana.pid"
+grafana_home="@PREFIX@/share/${name}"
+pidfile="@VARBASE@/run/${name}.pid"
 command="@PREFIX@/bin/grafana-server"
-command_args="-homepath ${grafana_chdir} -config @PKG_SYSCONFDIR@/grafana.conf -pidfile ${pidfile} < /dev/null > /dev/null 2>&1 &"
+command_args="-homepath ${grafana_home} -config @PKG_SYSCONFDIR@/grafana.conf -pidfile ${pidfile} < /dev/null > /dev/null 2>&1 &"
 
-load_rc_config $name
-run_rc_command "$1"
+if [ -f /etc/rc.subr -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
+       load_rc_config $name
+       run_rc_command "$1"
+else
+       if [ -f /etc/rc.conf ]; then
+               . /etc/rc.conf
+       fi
+       case "$1" in
+       start)
+               if [ -r "${pidfile}" ]; then
+                       @ECHO@ "Already running ${name}."
+               else
+                       @ECHO@ "Starting ${name}."
+                       eval ${command} ${command_args}
+               fi
+               ;;
+       stop)
+               if [ -r "${pidfile}" ]; then
+                       @ECHO@ "Stopping ${name}."
+                       kill `@CAT@ ${pidfile}` && @RM@ ${pidfile}
+               fi
+               ;;
+       *)
+               @ECHO@ "Usage: $0 {start|stop}" 1>&2
+               exit 10
+               ;;
+       esac
+fi