Date: Wed, 31 May 2017 16:53:03 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442223 - in head/www/grafana4: . files Message-ID: <201705311653.v4VGr3C0035513@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Wed May 31 16:53:03 2017 New Revision: 442223 URL: https://svnweb.freebsd.org/changeset/ports/442223 Log: www/grafana4: update and fix bugs * Update to 4.3.2 [1] * Fix paths not to include the major version to fix plugin install and keep things uniform [2] * Correct boot.js seems to be used now [3] PR: 219639 [1] PR: 218010 [2] PR: 219131 [3] Submitted by: farrokhi [1] Reported by: Borja Marcos <borjam@sarenet.es> [2] Reported by: Ari Suutari <ari@stonepile.fi> [3] Added: head/www/grafana4/files/grafana.conf.in - copied unchanged from r442222, head/www/grafana4/files/grafana4.conf.in head/www/grafana4/files/grafana.in - copied, changed from r442222, head/www/grafana4/files/grafana4.in Deleted: head/www/grafana4/files/grafana4.conf.in head/www/grafana4/files/grafana4.in Modified: head/www/grafana4/Makefile head/www/grafana4/distinfo head/www/grafana4/pkg-plist Modified: head/www/grafana4/Makefile ============================================================================== --- head/www/grafana4/Makefile Wed May 31 16:38:21 2017 (r442222) +++ head/www/grafana4/Makefile Wed May 31 16:53:03 2017 (r442223) @@ -1,12 +1,13 @@ # $FreeBSD$ PORTNAME= grafana -PORTVERSION= 4.2.0 +PORTVERSION= 4.3.2 DISTVERSIONPREFIX= v CATEGORIES= www -MASTER_SITES+= https://s3-us-west-2.amazonaws.com/:public +MASTER_SITES+= https://s3-us-west-2.amazonaws.com/grafana-releases/release/:public PKGNAMESUFFIX= ${PORTVERSION:C/([0-9]).*/\1/1} -DISTFILES= grafana-releases/release/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX}:public +DISTFILES= grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX}:public +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= swills@FreeBSD.org COMMENT= Dashboard and graph editor for Graphite, InfluxDB & OpenTSDB @@ -17,13 +18,13 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go ONLY_FOR_ARCHS= i386 amd64 -USE_RC_SUBR= grafana4 +USE_RC_SUBR= grafana USES= compiler -PLIST_SUB= PORTVERSION_MAJOR="${PORTVERSION:C/([0-9]).*/\1/1}" - USE_GITHUB= yes +GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} +TAG= 349f3eb GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana @@ -32,13 +33,13 @@ USERS= ${GRAFANA_USER} GROUPS= ${GRAFANA_GROUP} GRAFANAHOMEDIR= ${PREFIX}/share/grafana/ -GRAFANADATADIR= /var/db/${PKGBASE}/ -GRAFANALOGDIR= /var/log/${PKGBASE}/ -GRAFANAPIDDIR= /var/run/${PKGBASE}/ -GRAFANAPLUGINDIR= /var/db/${PKGBASE}/plugins -GRAFANADASHBOARDDIR= /var/db/${PKGBASE}/dashboards +GRAFANADATADIR= /var/db/${PORTNAME}/ +GRAFANALOGDIR= /var/log/${PORTNAME}/ +GRAFANAPIDDIR= /var/run/${PORTNAME}/ +GRAFANAPLUGINDIR= /var/db/${PORTNAME}/plugins +GRAFANADASHBOARDDIR= /var/db/${PORTNAME}/dashboards -SUB_FILES= grafana4 grafana4.conf +SUB_FILES= grafana grafana.conf SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} \ GRAFANA_GROUP=${GRAFANA_GROUP} \ GRAFANADATADIR=${GRAFANADATADIR} \ @@ -51,21 +52,12 @@ SUB_LIST+= GRAFANA_USER=${GRAFANA_USER} \ PLIST_SUB+= GRAFANAHOMEDIR=${GRAFANAHOMEDIR} post-extract: - @${MV} ${WRKSRC}/vendor/ ${WRKSRC}/src/ - @${MKDIR} ${WRKSRC}/src/github.com/grafana/grafana -.for src in CHANGELOG.md Gruntfile.js LICENSE.md Makefile NOTICE.md README.md \ - bower.json build.go circle.yml conf docker docs emails examples \ - karma.conf.js latest.json package.json packaging pkg scripts tasks \ - tests tsconfig.json tslint.json yarn.lock - @${MV} ${WRKSRC}/${src} \ - ${WRKSRC}/src/github.com/grafana/grafana -.endfor - ${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public - ${MV} ${WRKDIR}/grafana-${PORTVERSION}/public ${WRKSRC}/src/github.com/grafana/grafana/public + @${RM} -r ${WRKSRC}/src/github.com/grafana/grafana/public + @(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/grafana-${PORTVERSION}.linux-x64${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS} grafana-${PORTVERSION}/public) do-build: - cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/grafana; \ - ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go run build.go build + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-server ./pkg/cmd/grafana-server + @cd ${WRKSRC}/src/github.com/${PORTNAME}/${PORTNAME} ; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-w -X main.version=${PORTVERSION} -X main.commit=${TAG}" -o ./bin/grafana-cli ./pkg/cmd/grafana-cli do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/grafana/grafana/bin/grafana-server \ @@ -85,7 +77,7 @@ do-install: ${MKDIR} ${STAGEDIR}${GRAFANAHOMEDIR}/data/log ${INSTALL_DATA} ${WRKSRC}/src/github.com/grafana/grafana/conf/defaults.ini \ ${STAGEDIR}${GRAFANAHOMEDIR}/conf/defaults.ini - ${INSTALL_DATA} ${WRKDIR}/grafana4.conf ${STAGEDIR}${PREFIX}/etc/grafana4.conf.sample + ${INSTALL_DATA} ${WRKDIR}/grafana.conf ${STAGEDIR}${PREFIX}/etc/grafana.conf.sample .include <bsd.port.pre.mk> Modified: head/www/grafana4/distinfo ============================================================================== --- head/www/grafana4/distinfo Wed May 31 16:38:21 2017 (r442222) +++ head/www/grafana4/distinfo Wed May 31 16:53:03 2017 (r442223) @@ -1,5 +1,5 @@ -TIMESTAMP = 1491660293 -SHA256 (grafana-releases/release/grafana-4.2.0.linux-x64.tar.gz) = e9927baaaf6cbcab64892dedd11ccf509e4edea54670db4250b9e7568466ec61 -SIZE (grafana-releases/release/grafana-4.2.0.linux-x64.tar.gz) = 45741731 -SHA256 (grafana-grafana-v4.2.0_GH0.tar.gz) = 87c9f123b2511dd57a6ff14c7b67dc3def678eefd9d22fd27e8fbb907a8e076a -SIZE (grafana-grafana-v4.2.0_GH0.tar.gz) = 8463603 +TIMESTAMP = 1496234916 +SHA256 (grafana-4.3.2.linux-x64.tar.gz) = 0c835229d1dcba43cbb79014ef0782edbd7b58d156a6aa2886a07bb52232666e +SIZE (grafana-4.3.2.linux-x64.tar.gz) = 47036583 +SHA256 (grafana-grafana-v4.3.2_GH0.tar.gz) = 02753931d9abb5d94e0695fdb44f5ede0a537cad57a7d60f44125056c04129ab +SIZE (grafana-grafana-v4.3.2_GH0.tar.gz) = 9017723 Copied: head/www/grafana4/files/grafana.conf.in (from r442222, head/www/grafana4/files/grafana4.conf.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/grafana4/files/grafana.conf.in Wed May 31 16:53:03 2017 (r442223, copy of r442222, head/www/grafana4/files/grafana4.conf.in) @@ -0,0 +1,270 @@ +##################### Grafana Configuration Example ##################### +# +# Everything has defaults so you only need to uncomment things you want to +# change + +# possible values : production, development +; app_mode = production + +#################################### Paths #################################### +[paths] +# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) +# +data = %%GRAFANADATADIR%% +# +# Directory where grafana can store logs +# +logs = %%GRAFANALOGDIR%% +# +# Directory where grafana will automatically scan and look for plugins +# +plugins = %%GRAFANAPLUGINDIR%% + +# +#################################### Server #################################### +[server] +# Protocol (http or https) +;protocol = http + +# The ip address to bind to, empty will bind to all interfaces +;http_addr = + +# The http port to use +;http_port = 3000 + +# The public facing domain name used to access grafana from a browser +;domain = localhost + +# Redirect to correct domain if host header does not match domain +# Prevents DNS rebinding attacks +;enforce_domain = false + +# The full public facing url +;root_url = %(protocol)s://%(domain)s:%(http_port)s/ + +# Log web requests +;router_logging = false + +# the path relative working path +static_root_path = public + +# enable gzip +;enable_gzip = false + +# https certs & key file +;cert_file = +;cert_key = + +#################################### Database #################################### +[database] +# Either "mysql", "postgres" or "sqlite3", it's your choice +;type = sqlite3 +;host = 127.0.0.1:3306 +;name = grafana +;user = root +;password = + +# For "postgres" only, either "disable", "require" or "verify-full" +;ssl_mode = disable + +# For "sqlite3" only, path relative to data_path setting +;path = grafana.db + +#################################### Session #################################### +[session] +# Either "memory", "file", "redis", "mysql", "postgres", default is "file" +;provider = file + +# Provider config options +# memory: not have any config yet +# file: session dir path, is relative to grafana data_path +# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana` +# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name` +# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable +;provider_config = sessions + +# Session cookie name +;cookie_name = grafana_sess + +# If you use session in https only, default is false +;cookie_secure = false + +# Session life time, default is 86400 +;session_life_time = 86400 + +#################################### Analytics #################################### +[analytics] +# Server reporting, sends usage counters to stats.grafana.org every 24 hours. +# No ip addresses are being tracked, only simple counters to track +# running instances, dashboard and error counts. It is very helpful to us. +# Change this option to false to disable reporting. +;reporting_enabled = true + +# Set to false to disable all checks to https://grafana.net +# for new vesions (grafana itself and plugins), check is used +# in some UI views to notify that grafana or plugin update exists +# This option does not cause any auto updates, nor send any information +# only a GET request to http://grafana.net to get latest versions +check_for_updates = true + +# Google Analytics universal tracking code, only enabled if you specify an id here +;google_analytics_ua_id = + +#################################### Security #################################### +[security] +# default admin user, created on startup +;admin_user = admin + +# default admin password, can be changed before first start of grafana, or in profile settings +;admin_password = admin + +# used for signing +;secret_key = SW2YcwTIb9zpOOhoPsMm + +# Auto-login remember days +;login_remember_days = 7 +;cookie_username = grafana_user +;cookie_remember_name = grafana_remember + +# disable gravatar profile images +;disable_gravatar = false + +# data source proxy whitelist (ip_or_domain:port seperated by spaces) +;data_source_proxy_whitelist = + +[snapshots] +# snapshot sharing options +;external_enabled = true +;external_snapshot_url = https://snapshots-origin.raintank.io +;external_snapshot_name = Publish to snapshot.raintank.io + +#################################### Users #################################### +[users] +# disable user signup / registration +;allow_sign_up = true + +# Allow non admin users to create organizations +;allow_org_create = true + +# Set to true to automatically assign new users to the default organization (id 1) +;auto_assign_org = true + +# Default role new users will be automatically assigned (if disabled above is set to true) +;auto_assign_org_role = Viewer + +# Background text for the user field on the login page +;login_hint = email or username + +#################################### Anonymous Auth ########################## +[auth.anonymous] +# enable anonymous access +;enabled = false + +# specify organization name that should be used for unauthenticated users +;org_name = Main Org. + +# specify role for unauthenticated users +;org_role = Viewer + +#################################### Github Auth ########################## +[auth.github] +;enabled = false +;allow_sign_up = false +;client_id = some_id +;client_secret = some_secret +;scopes = user:email,read:org +;auth_url = https://github.com/login/oauth/authorize +;token_url = https://github.com/login/oauth/access_token +;api_url = https://api.github.com/user +;team_ids = +;allowed_organizations = + +#################################### Google Auth ########################## +[auth.google] +;enabled = false +;allow_sign_up = false +;client_id = some_client_id +;client_secret = some_client_secret +;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email +;auth_url = https://accounts.google.com/o/oauth2/auth +;token_url = https://accounts.google.com/o/oauth2/token +;api_url = https://www.googleapis.com/oauth2/v1/userinfo +;allowed_domains = + +#################################### Auth Proxy ########################## +[auth.proxy] +;enabled = false +;header_name = X-WEBAUTH-USER +;header_property = username +;auto_sign_up = true + +#################################### Basic Auth ########################## +[auth.basic] +;enabled = true + +#################################### Auth LDAP ########################## +[auth.ldap] +;enabled = false +;config_file = /etc/grafana/ldap.toml + +#################################### SMTP / Emailing ########################## +[smtp] +;enabled = false +;host = localhost:25 +;user = +;password = +;cert_file = +;key_file = +;skip_verify = false +;from_address = admin@grafana.localhost + +[emails] +;welcome_email_on_sign_up = false + +#################################### Logging ########################## +[log] +# Either "console", "file", "syslog". Default is console and file +# Use comma to separate multiple modes, e.g. "console, file" +;mode = console, file + +# Buffer length of channel, keep it as it is if you don't know what it is. +;buffer_len = 10000 + +# Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Info" +;level = Info + +# For "console" mode only +[log.console] +;level = + +# For "file" mode only +[log.file] +;level = +# This enables automated log rotate(switch of following options), default is true +;log_rotate = true + +# Max line number of single file, default is 1000000 +;max_lines = 1000000 + +# Max size shift of single file, default is 28 means 1 << 28, 256MB +;max_lines_shift = 28 + +# Segment log daily, default is true +;daily_rotate = true + +# Expired days of log file(delete after max days), default is 7 +;max_days = 7 + +#################################### AMPQ Event Publisher ########################## +[event_publisher] +;enabled = false +;rabbitmq_url = amqp://localhost/ +;exchange = grafana_events + +;#################################### Dashboard JSON files ########################## +[dashboards.json] +;enabled = false +path = %%GRAFANADASHBOARDDIR%% + + + Copied and modified: head/www/grafana4/files/grafana.in (from r442222, head/www/grafana4/files/grafana4.in) ============================================================================== --- head/www/grafana4/files/grafana4.in Wed May 31 16:38:21 2017 (r442222, copy source) +++ head/www/grafana4/files/grafana.in Wed May 31 16:53:03 2017 (r442223) @@ -2,48 +2,48 @@ # $FreeBSD$ # -# PROVIDE: grafana4 +# PROVIDE: grafana # REQUIRE: LOGIN # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable grafana # grafana_enable="YES" # -# grafana4_enable (bool): Set to YES to enable grafana +# grafana_enable (bool): Set to YES to enable grafana # Default: NO -# grafana4_conf (str): grafana configration file +# grafana_conf (str): grafana configration file # Default: %%PREFIX%%/etc/grafana.cfg -# grafana4_user (str): grafana daemon user +# grafana_user (str): grafana daemon user # Default: %%GRAFANA_USER%% -# grafana4_group (str): grafana daemon group +# grafana_group (str): grafana daemon group # Default: %%GRAFANA_GROUP%% . /etc/rc.subr -name="grafana4" -rcvar=grafana4_enable +name="grafana" +rcvar=grafana_enable load_rc_config $name -: ${grafana4_enable:="NO"} -: ${grafana4_user:="%%GRAFANA_USER%%"} -: ${grafana4_group:="%%GRAFANA_GROUP%%"} -: ${grafana4_flags:=""} -: ${grafana4_conf:="%%PREFIX%%/etc/${name}.conf"} -: ${grafana4_options:="-config=${grafana4_conf} -homepath=%%GRAFANAHOMEDIR%%"} +: ${grafana_enable:="NO"} +: ${grafana_user:="%%GRAFANA_USER%%"} +: ${grafana_group:="%%GRAFANA_GROUP%%"} +: ${grafana_flags:=""} +: ${grafana_conf:="%%PREFIX%%/etc/${name}.conf"} +: ${grafana_options:="-config=${grafana_conf} -homepath=%%GRAFANAHOMEDIR%%"} pidfile="%%GRAFANAPIDDIR%%${name}.pid" procname="%%PREFIX%%/bin/grafana-server" command=/usr/sbin/daemon -command_args="-f -c -p ${pidfile} ${procname} ${grafana4_options}" +command_args="-f -c -p ${pidfile} ${procname} ${grafana_options}" start_precmd="grafana_precmd" grafana_precmd() { - chown ${grafana4_user}:${grafana4_group} %%GRAFANADATADIR%% - chown ${grafana4_user}:${grafana4_group} %%GRAFANALOGDIR%% - chown ${grafana4_user}:${grafana4_group} %%GRAFANAHOMEDIR%%data/log/ - install -d -o ${grafana4_user} %%GRAFANAPIDDIR%% - install -o ${grafana4_user} /dev/null ${pidfile} + chown ${grafana_user}:${grafana_group} %%GRAFANADATADIR%% + chown ${grafana_user}:${grafana_group} %%GRAFANALOGDIR%% + chown ${grafana_user}:${grafana_group} %%GRAFANAHOMEDIR%%data/log/ + install -d -o ${grafana_user} %%GRAFANAPIDDIR%% + install -o ${grafana_user} /dev/null ${pidfile} } run_rc_command "$1" Modified: head/www/grafana4/pkg-plist ============================================================================== --- head/www/grafana4/pkg-plist Wed May 31 16:38:21 2017 (r442222) +++ head/www/grafana4/pkg-plist Wed May 31 16:53:03 2017 (r442223) @@ -1,13 +1,13 @@ bin/grafana-cli bin/grafana-server -@sample etc/grafana%%PORTVERSION_MAJOR%%.conf.sample +@sample etc/grafana.conf.sample %%DATADIR%%/conf/defaults.ini %%DATADIR%%/public/app/app.d.ts %%DATADIR%%/public/app/app.js %%DATADIR%%/public/app/app.js.map %%DATADIR%%/public/app/app.ts %%DATADIR%%/public/app/app_bundle.js -%%DATADIR%%/public/app/boot.5ee7468a.js +%%DATADIR%%/public/app/boot.d709d8d5.js %%DATADIR%%/public/app/boot.js %%DATADIR%%/public/app/core/app_events.d.ts %%DATADIR%%/public/app/core/app_events.js @@ -98,7 +98,6 @@ bin/grafana-server %%DATADIR%%/public/app/core/core_module.js %%DATADIR%%/public/app/core/core_module.js.map %%DATADIR%%/public/app/core/core_module.ts -%%DATADIR%%/public/app/core/directives/annotation_tooltip.js %%DATADIR%%/public/app/core/directives/array_join.d.ts %%DATADIR%%/public/app/core/directives/array_join.js %%DATADIR%%/public/app/core/directives/array_join.js.map @@ -233,6 +232,10 @@ bin/grafana-server %%DATADIR%%/public/app/core/utils/sort_by_keys.js %%DATADIR%%/public/app/core/utils/sort_by_keys.js.map %%DATADIR%%/public/app/core/utils/sort_by_keys.ts +%%DATADIR%%/public/app/core/utils/ticks.d.ts +%%DATADIR%%/public/app/core/utils/ticks.js +%%DATADIR%%/public/app/core/utils/ticks.js.map +%%DATADIR%%/public/app/core/utils/ticks.ts %%DATADIR%%/public/app/features/admin/admin.d.ts %%DATADIR%%/public/app/features/admin/admin.js %%DATADIR%%/public/app/features/admin/admin.js.map @@ -298,6 +301,14 @@ bin/grafana-server %%DATADIR%%/public/app/features/alerting/threshold_mapper.js.map %%DATADIR%%/public/app/features/alerting/threshold_mapper.ts %%DATADIR%%/public/app/features/all.js +%%DATADIR%%/public/app/features/annotations/all.d.ts +%%DATADIR%%/public/app/features/annotations/all.js +%%DATADIR%%/public/app/features/annotations/all.js.map +%%DATADIR%%/public/app/features/annotations/all.ts +%%DATADIR%%/public/app/features/annotations/annotation_tooltip.d.ts +%%DATADIR%%/public/app/features/annotations/annotation_tooltip.js +%%DATADIR%%/public/app/features/annotations/annotation_tooltip.js.map +%%DATADIR%%/public/app/features/annotations/annotation_tooltip.ts %%DATADIR%%/public/app/features/annotations/annotations_srv.d.ts %%DATADIR%%/public/app/features/annotations/annotations_srv.js %%DATADIR%%/public/app/features/annotations/annotations_srv.js.map @@ -306,7 +317,20 @@ bin/grafana-server %%DATADIR%%/public/app/features/annotations/editor_ctrl.js %%DATADIR%%/public/app/features/annotations/editor_ctrl.js.map %%DATADIR%%/public/app/features/annotations/editor_ctrl.ts +%%DATADIR%%/public/app/features/annotations/event.d.ts +%%DATADIR%%/public/app/features/annotations/event.js +%%DATADIR%%/public/app/features/annotations/event.js.map +%%DATADIR%%/public/app/features/annotations/event.ts +%%DATADIR%%/public/app/features/annotations/event_editor.d.ts +%%DATADIR%%/public/app/features/annotations/event_editor.js +%%DATADIR%%/public/app/features/annotations/event_editor.js.map +%%DATADIR%%/public/app/features/annotations/event_editor.ts +%%DATADIR%%/public/app/features/annotations/event_manager.d.ts +%%DATADIR%%/public/app/features/annotations/event_manager.js +%%DATADIR%%/public/app/features/annotations/event_manager.js.map +%%DATADIR%%/public/app/features/annotations/event_manager.ts %%DATADIR%%/public/app/features/annotations/partials/editor.html +%%DATADIR%%/public/app/features/annotations/partials/event_editor.html %%DATADIR%%/public/app/features/dashboard/ad_hoc_filters.d.ts %%DATADIR%%/public/app/features/dashboard/ad_hoc_filters.js %%DATADIR%%/public/app/features/dashboard/ad_hoc_filters.js.map @@ -361,6 +385,7 @@ bin/grafana-server %%DATADIR%%/public/app/features/dashboard/model.js %%DATADIR%%/public/app/features/dashboard/model.js.map %%DATADIR%%/public/app/features/dashboard/model.ts +%%DATADIR%%/public/app/features/dashboard/partials/addAnnotationModal.html %%DATADIR%%/public/app/features/dashboard/partials/dash_list.html %%DATADIR%%/public/app/features/dashboard/partials/graphiteImport.html %%DATADIR%%/public/app/features/dashboard/partials/inspector.html @@ -923,6 +948,28 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/datasource/mixed/module.js.map %%DATADIR%%/public/app/plugins/datasource/mixed/module.ts %%DATADIR%%/public/app/plugins/datasource/mixed/plugin.json +%%DATADIR%%/public/app/plugins/datasource/mysql/README.md +%%DATADIR%%/public/app/plugins/datasource/mysql/datasource.d.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/datasource.js +%%DATADIR%%/public/app/plugins/datasource/mysql/datasource.js.map +%%DATADIR%%/public/app/plugins/datasource/mysql/datasource.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/img/mysql_logo.svg +%%DATADIR%%/public/app/plugins/datasource/mysql/module.d.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/module.js +%%DATADIR%%/public/app/plugins/datasource/mysql/module.js.map +%%DATADIR%%/public/app/plugins/datasource/mysql/module.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/partials/annotations.editor.html +%%DATADIR%%/public/app/plugins/datasource/mysql/partials/config.html +%%DATADIR%%/public/app/plugins/datasource/mysql/partials/query.editor.html +%%DATADIR%%/public/app/plugins/datasource/mysql/plugin.json +%%DATADIR%%/public/app/plugins/datasource/mysql/query_ctrl.d.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/query_ctrl.js +%%DATADIR%%/public/app/plugins/datasource/mysql/query_ctrl.js.map +%%DATADIR%%/public/app/plugins/datasource/mysql/query_ctrl.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/specs/datasource_specs.d.ts +%%DATADIR%%/public/app/plugins/datasource/mysql/specs/datasource_specs.js +%%DATADIR%%/public/app/plugins/datasource/mysql/specs/datasource_specs.js.map +%%DATADIR%%/public/app/plugins/datasource/mysql/specs/datasource_specs.ts %%DATADIR%%/public/app/plugins/datasource/opentsdb/README.md %%DATADIR%%/public/app/plugins/datasource/opentsdb/config_ctrl.d.ts %%DATADIR%%/public/app/plugins/datasource/opentsdb/config_ctrl.js @@ -1023,6 +1070,10 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/panel/graph/graph.ts %%DATADIR%%/public/app/plugins/panel/graph/graph_tooltip.d.ts %%DATADIR%%/public/app/plugins/panel/graph/graph_tooltip.js +%%DATADIR%%/public/app/plugins/panel/graph/histogram.d.ts +%%DATADIR%%/public/app/plugins/panel/graph/histogram.js +%%DATADIR%%/public/app/plugins/panel/graph/histogram.js.map +%%DATADIR%%/public/app/plugins/panel/graph/histogram.ts %%DATADIR%%/public/app/plugins/panel/graph/img/icn-graph-panel.svg %%DATADIR%%/public/app/plugins/panel/graph/jquery.flot.events.js %%DATADIR%%/public/app/plugins/panel/graph/legend.js @@ -1044,6 +1095,10 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/panel/graph/specs/graph_specs.js %%DATADIR%%/public/app/plugins/panel/graph/specs/graph_specs.js.map %%DATADIR%%/public/app/plugins/panel/graph/specs/graph_specs.ts +%%DATADIR%%/public/app/plugins/panel/graph/specs/histogram_specs.d.ts +%%DATADIR%%/public/app/plugins/panel/graph/specs/histogram_specs.js +%%DATADIR%%/public/app/plugins/panel/graph/specs/histogram_specs.js.map +%%DATADIR%%/public/app/plugins/panel/graph/specs/histogram_specs.ts %%DATADIR%%/public/app/plugins/panel/graph/specs/threshold_manager_specs.d.ts %%DATADIR%%/public/app/plugins/panel/graph/specs/threshold_manager_specs.js %%DATADIR%%/public/app/plugins/panel/graph/specs/threshold_manager_specs.js.map @@ -1066,6 +1121,52 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/panel/graph/thresholds_form.js %%DATADIR%%/public/app/plugins/panel/graph/thresholds_form.js.map %%DATADIR%%/public/app/plugins/panel/graph/thresholds_form.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/README.md +%%DATADIR%%/public/app/plugins/panel/heatmap/axes_editor.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/axes_editor.js +%%DATADIR%%/public/app/plugins/panel/heatmap/axes_editor.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/axes_editor.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/display_editor.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/display_editor.js +%%DATADIR%%/public/app/plugins/panel/heatmap/display_editor.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/display_editor.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_ctrl.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_ctrl.js +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_ctrl.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_ctrl.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_data_converter.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_data_converter.js +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_data_converter.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_data_converter.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_tooltip.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_tooltip.js +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_tooltip.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/heatmap_tooltip.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/img/icn-heatmap-panel.svg +%%DATADIR%%/public/app/plugins/panel/heatmap/module.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/module.html +%%DATADIR%%/public/app/plugins/panel/heatmap/module.js +%%DATADIR%%/public/app/plugins/panel/heatmap/module.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/module.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/partials/axes_editor.html +%%DATADIR%%/public/app/plugins/panel/heatmap/partials/display_editor.html +%%DATADIR%%/public/app/plugins/panel/heatmap/plugin.json +%%DATADIR%%/public/app/plugins/panel/heatmap/rendering.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/rendering.js +%%DATADIR%%/public/app/plugins/panel/heatmap/rendering.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/rendering.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.js +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_ctrl_specs.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_data_converter_specs.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_data_converter_specs.js +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_data_converter_specs.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/heatmap_data_converter_specs.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/renderer_specs.d.ts +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/renderer_specs.js +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/renderer_specs.js.map +%%DATADIR%%/public/app/plugins/panel/heatmap/specs/renderer_specs.ts %%DATADIR%%/public/app/plugins/panel/pluginlist/README.md %%DATADIR%%/public/app/plugins/panel/pluginlist/editor.html %%DATADIR%%/public/app/plugins/panel/pluginlist/img/icn-dashlist-panel.svg @@ -1085,15 +1186,20 @@ bin/grafana-server %%DATADIR%%/public/app/plugins/panel/singlestat/module.js.map %%DATADIR%%/public/app/plugins/panel/singlestat/module.ts %%DATADIR%%/public/app/plugins/panel/singlestat/plugin.json -%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat-specs.d.ts -%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat-specs.js -%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat-specs.js.map -%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat-specs.ts %%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.d.ts %%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.js %%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.js.map %%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.ts +%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_specs.d.ts +%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_specs.js +%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_specs.js.map +%%DATADIR%%/public/app/plugins/panel/singlestat/specs/singlestat_specs.ts %%DATADIR%%/public/app/plugins/panel/table/README.md +%%DATADIR%%/public/app/plugins/panel/table/column_options.d.ts +%%DATADIR%%/public/app/plugins/panel/table/column_options.html +%%DATADIR%%/public/app/plugins/panel/table/column_options.js +%%DATADIR%%/public/app/plugins/panel/table/column_options.js.map +%%DATADIR%%/public/app/plugins/panel/table/column_options.ts %%DATADIR%%/public/app/plugins/panel/table/editor.d.ts %%DATADIR%%/public/app/plugins/panel/table/editor.html %%DATADIR%%/public/app/plugins/panel/table/editor.js @@ -1150,12 +1256,12 @@ bin/grafana-server %%DATADIR%%/public/css/grafana.dark.css.map %%DATADIR%%/public/css/grafana.dark.min.css %%DATADIR%%/public/css/grafana.dark.min.css.map -%%DATADIR%%/public/css/grafana.dark.min.fc104690.css -%%DATADIR%%/public/css/grafana.dark.min.fc104690.css.map +%%DATADIR%%/public/css/grafana.dark.min.d72a4c96.css +%%DATADIR%%/public/css/grafana.dark.min.d72a4c96.css.map %%DATADIR%%/public/css/grafana.light.css %%DATADIR%%/public/css/grafana.light.css.map -%%DATADIR%%/public/css/grafana.light.min.2def29fc.css -%%DATADIR%%/public/css/grafana.light.min.2def29fc.css.map +%%DATADIR%%/public/css/grafana.light.min.5fc70102.css +%%DATADIR%%/public/css/grafana.light.min.5fc70102.css.map %%DATADIR%%/public/css/grafana.light.min.css %%DATADIR%%/public/css/grafana.light.min.css.map %%DATADIR%%/public/dashboards/default.json @@ -1177,6 +1283,7 @@ bin/grafana-server %%DATADIR%%/public/fonts/fontawesome-webfont.svg %%DATADIR%%/public/fonts/fontawesome-webfont.ttf %%DATADIR%%/public/fonts/fontawesome-webfont.woff +%%DATADIR%%/public/fonts/fontawesome-webfont.woff2 %%DATADIR%%/public/fonts/grafana-icons.eot %%DATADIR%%/public/fonts/grafana-icons.svg %%DATADIR%%/public/fonts/grafana-icons.ttf @@ -1261,7 +1368,6 @@ bin/grafana-server %%DATADIR%%/public/img/warn-tiny.svg %%DATADIR%%/public/img/warn.svg %%DATADIR%%/public/robots.txt -%%DATADIR%%/public/sass/.sass-lint.yml %%DATADIR%%/public/sass/_grafana.scss %%DATADIR%%/public/sass/_old_responsive.scss %%DATADIR%%/public/sass/_variables.dark.scss @@ -1276,6 +1382,19 @@ bin/grafana-server %%DATADIR%%/public/sass/base/_normalize.scss %%DATADIR%%/public/sass/base/_reboot.scss %%DATADIR%%/public/sass/base/_type.scss +%%DATADIR%%/public/sass/base/font-awesome/_animated.scss +%%DATADIR%%/public/sass/base/font-awesome/_bordered-pulled.scss +%%DATADIR%%/public/sass/base/font-awesome/_core.scss +%%DATADIR%%/public/sass/base/font-awesome/_fixed-width.scss +%%DATADIR%%/public/sass/base/font-awesome/_icons.scss +%%DATADIR%%/public/sass/base/font-awesome/_larger.scss +%%DATADIR%%/public/sass/base/font-awesome/_list.scss +%%DATADIR%%/public/sass/base/font-awesome/_mixins.scss +%%DATADIR%%/public/sass/base/font-awesome/_path.scss +%%DATADIR%%/public/sass/base/font-awesome/_rotated-flipped.scss +%%DATADIR%%/public/sass/base/font-awesome/_screen-reader.scss +%%DATADIR%%/public/sass/base/font-awesome/_stacked.scss +%%DATADIR%%/public/sass/base/font-awesome/_variables.scss %%DATADIR%%/public/sass/components/_alerts.scss %%DATADIR%%/public/sass/components/_buttons.scss %%DATADIR%%/public/sass/components/_cards.scss @@ -1297,6 +1416,7 @@ bin/grafana-server %%DATADIR%%/public/sass/components/_panel_dashlist.scss %%DATADIR%%/public/sass/components/_panel_gettingstarted.scss %%DATADIR%%/public/sass/components/_panel_graph.scss +%%DATADIR%%/public/sass/components/_panel_heatmap.scss %%DATADIR%%/public/sass/components/_panel_pluginlist.scss %%DATADIR%%/public/sass/components/_panel_singlestat.scss %%DATADIR%%/public/sass/components/_panel_table.scss @@ -1323,6 +1443,7 @@ bin/grafana-server %%DATADIR%%/public/sass/fonts.scss %%DATADIR%%/public/sass/grafana.dark.scss %%DATADIR%%/public/sass/grafana.light.scss +%%DATADIR%%/public/sass/icons.json %%DATADIR%%/public/sass/layout/_lists.scss %%DATADIR%%/public/sass/layout/_page.scss %%DATADIR%%/public/sass/mixins/_animations.scss @@ -1349,19 +1470,36 @@ bin/grafana-server %%DATADIR%%/public/sass/utils/_utils.scss %%DATADIR%%/public/sass/utils/_validation.scss %%DATADIR%%/public/sass/utils/_widths.scss -%%DATADIR%%/public/test/.jshintrc +%%DATADIR%%/public/test/core/table_model_specs.d.ts +%%DATADIR%%/public/test/core/table_model_specs.js +%%DATADIR%%/public/test/core/table_model_specs.js.map %%DATADIR%%/public/test/core/table_model_specs.ts %%DATADIR%%/public/test/core/time_series_specs.js +%%DATADIR%%/public/test/core/utils/datemath_specs.d.ts +%%DATADIR%%/public/test/core/utils/datemath_specs.js +%%DATADIR%%/public/test/core/utils/datemath_specs.js.map %%DATADIR%%/public/test/core/utils/datemath_specs.ts +%%DATADIR%%/public/test/core/utils/emitter_specs.d.ts +%%DATADIR%%/public/test/core/utils/emitter_specs.js +%%DATADIR%%/public/test/core/utils/emitter_specs.js.map %%DATADIR%%/public/test/core/utils/emitter_specs.ts +%%DATADIR%%/public/test/core/utils/flatten_specs.d.ts +%%DATADIR%%/public/test/core/utils/flatten_specs.js +%%DATADIR%%/public/test/core/utils/flatten_specs.js.map %%DATADIR%%/public/test/core/utils/flatten_specs.ts %%DATADIR%%/public/test/core/utils/kbn_specs.js +%%DATADIR%%/public/test/core/utils/rangeutil_specs.d.ts +%%DATADIR%%/public/test/core/utils/rangeutil_specs.js +%%DATADIR%%/public/test/core/utils/rangeutil_specs.js.map %%DATADIR%%/public/test/core/utils/rangeutil_specs.ts %%DATADIR%%/public/test/lib/common.d.ts %%DATADIR%%/public/test/lib/common.js %%DATADIR%%/public/test/lib/common.js.map %%DATADIR%%/public/test/lib/common.ts %%DATADIR%%/public/test/mocks/dashboard-mock.js +%%DATADIR%%/public/test/specs/app_specs.d.ts +%%DATADIR%%/public/test/specs/app_specs.js +%%DATADIR%%/public/test/specs/app_specs.js.map %%DATADIR%%/public/test/specs/app_specs.ts %%DATADIR%%/public/test/specs/dashboardViewStateSrv-specs.js %%DATADIR%%/public/test/specs/datasource_srv_specs.js @@ -1373,14 +1511,12 @@ bin/grafana-server %%DATADIR%%/public/test/specs/unsavedChangesSrv-specs.js %%DATADIR%%/public/test/specs/value_select_dropdown_specs.js %%DATADIR%%/public/test/test-main.js -%%DATADIR%%/public/vendor/angular-bindonce/.bower.json %%DATADIR%%/public/vendor/angular-bindonce/CHANGELOG.md %%DATADIR%%/public/vendor/angular-bindonce/README.md %%DATADIR%%/public/vendor/angular-bindonce/bindonce.js %%DATADIR%%/public/vendor/angular-bindonce/bindonce.min.js %%DATADIR%%/public/vendor/angular-bindonce/bower.json %%DATADIR%%/public/vendor/angular-bindonce/package.json -%%DATADIR%%/public/vendor/angular-mocks/.bower.json %%DATADIR%%/public/vendor/angular-mocks/LICENSE.md %%DATADIR%%/public/vendor/angular-mocks/README.md %%DATADIR%%/public/vendor/angular-mocks/angular-mocks.js @@ -1389,7 +1525,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-mocks/ngMock.js %%DATADIR%%/public/vendor/angular-mocks/ngMockE2E.js %%DATADIR%%/public/vendor/angular-mocks/package.json -%%DATADIR%%/public/vendor/angular-native-dragdrop/.bower.json %%DATADIR%%/public/vendor/angular-native-dragdrop/Gulpfile.js %%DATADIR%%/public/vendor/angular-native-dragdrop/LICENSE %%DATADIR%%/public/vendor/angular-native-dragdrop/README.md @@ -1408,7 +1543,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-other/angular-strap.js %%DATADIR%%/public/vendor/angular-other/datepicker.js %%DATADIR%%/public/vendor/angular-other/timepicker.js -%%DATADIR%%/public/vendor/angular-route/.bower.json %%DATADIR%%/public/vendor/angular-route/LICENSE.md %%DATADIR%%/public/vendor/angular-route/README.md %%DATADIR%%/public/vendor/angular-route/angular-route.js @@ -1417,7 +1551,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-route/bower.json %%DATADIR%%/public/vendor/angular-route/index.js %%DATADIR%%/public/vendor/angular-route/package.json -%%DATADIR%%/public/vendor/angular-sanitize/.bower.json %%DATADIR%%/public/vendor/angular-sanitize/LICENSE.md %%DATADIR%%/public/vendor/angular-sanitize/README.md %%DATADIR%%/public/vendor/angular-sanitize/angular-sanitize.js @@ -1427,7 +1560,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular-sanitize/index.js %%DATADIR%%/public/vendor/angular-sanitize/package.json %%DATADIR%%/public/vendor/angular-ui/ui-bootstrap-tpls.js -%%DATADIR%%/public/vendor/angular/.bower.json %%DATADIR%%/public/vendor/angular/LICENSE.md %%DATADIR%%/public/vendor/angular/README.md %%DATADIR%%/public/vendor/angular/angular-csp.css @@ -1439,7 +1571,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/angular/index.js %%DATADIR%%/public/vendor/angular/package.json %%DATADIR%%/public/vendor/bootstrap/bootstrap.js -%%DATADIR%%/public/vendor/clipboard/.bower.json %%DATADIR%%/public/vendor/clipboard/bower.json %%DATADIR%%/public/vendor/clipboard/contributing.md %%DATADIR%%/public/vendor/clipboard/dist/clipboard.js @@ -1450,8 +1581,14 @@ bin/grafana-server %%DATADIR%%/public/vendor/crypto.min.js %%DATADIR%%/public/vendor/css/spectrum.css %%DATADIR%%/public/vendor/css/timepicker.css +%%DATADIR%%/public/vendor/d3/LICENSE +%%DATADIR%%/public/vendor/d3/README.md +%%DATADIR%%/public/vendor/d3/d3-scale-chromatic.min.js +%%DATADIR%%/public/vendor/d3/d3.js +%%DATADIR%%/public/vendor/d3/d3.v4.min.js %%DATADIR%%/public/vendor/filesaver.js %%DATADIR%%/public/vendor/flot/jquery.flot.crosshair.js +%%DATADIR%%/public/vendor/flot/jquery.flot.dashes.js %%DATADIR%%/public/vendor/flot/jquery.flot.fillbelow.js %%DATADIR%%/public/vendor/flot/jquery.flot.fillbetween.js %%DATADIR%%/public/vendor/flot/jquery.flot.gauge.js @@ -1461,7 +1598,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/flot/jquery.flot.stack.js %%DATADIR%%/public/vendor/flot/jquery.flot.stackpercent.js %%DATADIR%%/public/vendor/flot/jquery.flot.time.js -%%DATADIR%%/public/vendor/jquery/.bower.json %%DATADIR%%/public/vendor/jquery/AUTHORS.txt %%DATADIR%%/public/vendor/jquery/LICENSE.txt %%DATADIR%%/public/vendor/jquery/README.md @@ -1477,7 +1613,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/jquery/external/sizzle/dist/sizzle.js %%DATADIR%%/public/vendor/jquery/external/sizzle/dist/sizzle.min.js %%DATADIR%%/public/vendor/jquery/external/sizzle/dist/sizzle.min.map -%%DATADIR%%/public/vendor/jquery/src/.eslintrc %%DATADIR%%/public/vendor/jquery/src/ajax.js %%DATADIR%%/public/vendor/jquery/src/ajax/jsonp.js %%DATADIR%%/public/vendor/jquery/src/ajax/load.js @@ -1579,12 +1714,6 @@ bin/grafana-server %%DATADIR%%/public/vendor/jquery/src/var/toString.js %%DATADIR%%/public/vendor/jquery/src/wrap.js %%DATADIR%%/public/vendor/license.json -%%DATADIR%%/public/vendor/lodash/.bower.json -%%DATADIR%%/public/vendor/lodash/.editorconfig -%%DATADIR%%/public/vendor/lodash/.github/CONTRIBUTING.md -%%DATADIR%%/public/vendor/lodash/.jscsrc -%%DATADIR%%/public/vendor/lodash/.markdown-doctest-setup.js -%%DATADIR%%/public/vendor/lodash/.travis.yml %%DATADIR%%/public/vendor/lodash/LICENSE %%DATADIR%%/public/vendor/lodash/README.md %%DATADIR%%/public/vendor/lodash/dist/lodash.core.js @@ -3328,8 +3457,8 @@ bin/grafana-server %%DATADIR%%/public/views/500.html %%DATADIR%%/public/views/index.html @dir share/grafana/data/log -@dir /var/db/grafana%%PORTVERSION_MAJOR%%/dashboards -@dir /var/db/grafana%%PORTVERSION_MAJOR%%/plugins -@dir /var/db/grafana%%PORTVERSION_MAJOR%% -@dir /var/log/grafana%%PORTVERSION_MAJOR%% -@dir /var/run/grafana%%PORTVERSION_MAJOR%% +@dir /var/db/grafana/dashboards +@dir /var/db/grafana/plugins +@dir /var/db/grafana +@dir /var/log/grafana +@dir /var/run/grafana
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705311653.v4VGr3C0035513>