From owner-dev-commits-ports-all@freebsd.org Sat Sep 25 17:14:09 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 926CC6ACE22; Sat, 25 Sep 2021 17:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HGwVT3Ssvz4sTf; Sat, 25 Sep 2021 17:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 572336068; Sat, 25 Sep 2021 17:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18PHE9HI099481; Sat, 25 Sep 2021 17:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18PHE9kE099480; Sat, 25 Sep 2021 17:14:09 GMT (envelope-from git) Date: Sat, 25 Sep 2021 17:14:09 GMT Message-Id: <202109251714.18PHE9kE099480@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: f515b12972b8 - main - www/grafana7: Update to 7.5.10 and unbreak build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f515b12972b897bbaeb0dcba5fe8cbb39c8419cb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Sep 2021 17:14:09 -0000 The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=f515b12972b897bbaeb0dcba5fe8cbb39c8419cb commit f515b12972b897bbaeb0dcba5fe8cbb39c8419cb Author: Craig Leres AuthorDate: 2021-09-25 17:06:06 +0000 Commit: Craig Leres CommitDate: 2021-09-25 17:06:06 +0000 www/grafana7: Update to 7.5.10 and unbreak build Changes since 7.5.6: - Dockerfile: Fixes missing -no-cache. - Annotations: Prevent orphaned annotation tags cleanup when no annotations were cleaned. - Quota: Do not count folders towards dashboard quota. - Datasource: Add support for max_conns_per_host in dataproxy settings. - Datasource: Add support for max_idle_connections_per_host in dataproxy settings. - Instrumentation: Add metrics for outbound HTTP connections. - Snapshots: Remove dashboard links from dashboard snapshots. - Fix Unauthorized message that is displayed on sign-in or snapshot page. - Transformations: add `prepare time series' transformer. PR: 258134 Reported by: Fredrik Eriksson Approved by: robsonmantovani@gmail.com (maintainer timeout, 2 weeks) --- www/grafana7/Makefile | 4 ++-- www/grafana7/distinfo | 10 +++++----- www/grafana7/pkg-plist | 9 ++++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/www/grafana7/Makefile b/www/grafana7/Makefile index a0d87d26a904..df337b89bb4c 100644 --- a/www/grafana7/Makefile +++ b/www/grafana7/Makefile @@ -1,6 +1,6 @@ PORTNAME= grafana -DISTVERSION= 7.5.6 DISTVERSIONPREFIX= v +DISTVERSION= 7.5.10 CATEGORIES= www MASTER_SITES+= https://dl.grafana.com/oss/release/:public \ https://gitea.com/xorm/builder/archive/:builder \ @@ -220,7 +220,7 @@ SUB_LIST= GRAFANA_USER=${GRAFANA_USER} \ GRAFANA_LOGDIR=${GRAFANA_LOGDIR} \ GRAFANA_PLUGINDIR=${GRAFANA_PLUGINDIR} \ GRAFANA_PROVISIONINGDIR=${GRAFANA_PROVISIONINGDIR} \ - GRAFANA_BUILDHASH=3817b8b78f33fc1605dc + GRAFANA_BUILDHASH=0cd8deb042c68e8113e4 GRAFANA_USER?= grafana GRAFANA_GROUP?= grafana diff --git a/www/grafana7/distinfo b/www/grafana7/distinfo index 407ec55e08d5..370ee205e238 100644 --- a/www/grafana7/distinfo +++ b/www/grafana7/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1621248809 -SHA256 (grafana-7.5.6.linux-amd64.tar.gz) = dfa68869989c3607c106f8b8870209b273d36198dc47e7b229de84d048dddcd7 -SIZE (grafana-7.5.6.linux-amd64.tar.gz) = 52195022 +TIMESTAMP = 1631314689 +SHA256 (grafana-7.5.10.linux-amd64.tar.gz) = c706dde50bbe6ed452aa8c1709586671e3868978921de05a9898b44f1efdcec7 +SIZE (grafana-7.5.10.linux-amd64.tar.gz) = 52219967 SHA256 (v0.3.6.tar.gz) = af49dbe70ab6b0eb31d69afd89c3260b82cb662607b66eac41b65d642faee6bb SIZE (v0.3.6.tar.gz) = 22747 SHA256 (v0.7.3.tar.gz) = 9709c0e8eec3045832f9da81c7bcacf1a32774cb674efcd5662dd8b4d82f70c1 SIZE (v0.7.3.tar.gz) = 21163 SHA256 (v0.8.2.tar.gz) = 871cec6861f88b22fe36879e854872f960fae58a4e87d93c6c43d90558c8fc84 SIZE (v0.8.2.tar.gz) = 413897 -SHA256 (grafana-grafana-v7.5.6_GH0.tar.gz) = ea2eeb591e99f7eafb11d117c91509e5feefd2a5448bb9b774445a398f55e9f1 -SIZE (grafana-grafana-v7.5.6_GH0.tar.gz) = 10927027 +SHA256 (grafana-grafana-v7.5.10_GH0.tar.gz) = d29b640a5c0b1caeab5711e0782b2ee4f0499ac61a6f2c457493ac1c9f0c6a69 +SIZE (grafana-grafana-v7.5.10_GH0.tar.gz) = 10934399 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (FZambia-eagle-v0.0.1_GH0.tar.gz) = dc2dd0e2e582a2c8e8c7fadab6d1456b9ff2d15fe7c5a8e54986c0d961a200f1 diff --git a/www/grafana7/pkg-plist b/www/grafana7/pkg-plist index da9389f0ec1f..630b20ea724d 100644 --- a/www/grafana7/pkg-plist +++ b/www/grafana7/pkg-plist @@ -100,6 +100,9 @@ bin/grafana-server %%DATADIR%%/public/app/core/components/TransformersUI/SeriesToFieldsTransformerEditor.tsx %%DATADIR%%/public/app/core/components/TransformersUI/SeriesToRowsTransformerEditor.tsx %%DATADIR%%/public/app/core/components/TransformersUI/SortByTransformerEditor.tsx +%%DATADIR%%/public/app/core/components/TransformersUI/prepareTimeSeries/PrepareTimeSeriesEditor.tsx +%%DATADIR%%/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.test.ts +%%DATADIR%%/public/app/core/components/TransformersUI/prepareTimeSeries/prepareTimeSeries.ts %%DATADIR%%/public/app/core/components/WithFeatureToggle.tsx %%DATADIR%%/public/app/core/components/code_editor/brace.d.ts %%DATADIR%%/public/app/core/components/code_editor/code_editor.ts @@ -314,7 +317,7 @@ bin/grafana-server %%DATADIR%%/public/app/features/admin/partials/stats.html %%DATADIR%%/public/app/features/admin/partials/styleguide.html %%DATADIR%%/public/app/features/admin/state/actions.ts -%%DATADIR%%/public/app/features/admin/state/apis.ts +%%DATADIR%%/public/app/features/admin/state/apis.tsx %%DATADIR%%/public/app/features/admin/state/reducers.test.ts %%DATADIR%%/public/app/features/admin/state/reducers.ts %%DATADIR%%/public/app/features/alerting/AlertRuleItem.test.tsx @@ -2649,13 +2652,13 @@ bin/grafana-server @owner %%GRAFANA_USER%% @group %%GRAFANA_GROUP%% @mode 750 -@dir %%GRAFANA_DATADIR%% @dir %%GRAFANA_PLUGINDIR%% -@dir %%GRAFANA_PROVISIONINGDIR%% @dir %%GRAFANA_PROVISIONINGDIR%%/dashboards @dir %%GRAFANA_PROVISIONINGDIR%%/datasources @dir %%GRAFANA_PROVISIONINGDIR%%/notifiers @dir %%GRAFANA_PROVISIONINGDIR%%/plugins +@dir %%GRAFANA_PROVISIONINGDIR%% +@dir %%GRAFANA_DATADIR%% @dir %%GRAFANA_LOGDIR%% @mode @group