On Fri, Jun 23, 2023 at 02:10:51AM +0000, Lucas Raab wrote: > Hello, > > Small update ahead of the 10.x release. > > changelog: > > v9.5.3 > Bug fixes > Query: Prevent crash while executing concurrent mixed queries > Alerting: Require alert.notifications:write permissions to test > receivers and templates > > v9.5.5 > Bug fixes > Auth: Show invite button if disable login form is set to false. > Azure: Fix Kusto auto-completion for Azure datasources > RBAC: Remove legacy AC editor and admin role on new dashboard route. > Revert: Allow editors to access GET /datasources. > Settings: Add ability to override skip_org_role_sync with Env variables. > > No issues seen so far, but other tests? > > Thanks, > Lucas
and now with actual diffs...
diff refs/heads/master refs/heads/grafana commit - fe1231fe070e5d5e5489a49b01b2da3f356d7fed commit + 34025e44ece702edc4e8edc879fe9ad7b9f448d7 blob - 878456b8a900c0807de0d2a84634078b4f80c28e blob + 2832e6812ee713eb4641a62c46a66c287be7bf51 --- sysutils/grafana/Makefile +++ sysutils/grafana/Makefile @@ -1,11 +1,10 @@ COMMENT = monitoring and metric analytics dashboards -V = 9.5.2 +V = 9.5.5 DISTNAME = grafana+vendor-$V WRKDIST = ${WRKDIR}/grafana-$V EXTRACT_SUFX = .tar.zst PKGNAME = grafana-$V -REVISION = 0 MAINTAINER = Lucas Raab <tuftedoce...@fastmail.fm> blob - 9967559a2ca7bb34833a55dde493e2d866632c86 blob + 22b26f4398713132c372aff266d805f6d01fcae6 --- sysutils/grafana/distinfo +++ sysutils/grafana/distinfo @@ -1,4 +1,4 @@ -SHA256 (grafana+vendor-9.5.2.tar.zst) = Np0JdG4cF6rUkuc7xdrIs3Q1O9poazErw1VsYd34ryM= -SHA256 (grafana-9.5.2.linux-amd64.tar.gz) = xY600pasxP/+XbbbX4U3zp8R837/46+uJ9zQWva5Or8= -SIZE (grafana+vendor-9.5.2.tar.zst) = 44972612 -SIZE (grafana-9.5.2.linux-amd64.tar.gz) = 78499085 +SHA256 (grafana+vendor-9.5.5.tar.zst) = VWkSM7dZp12qT9jDUrALLnHzT3DX7P+ru4cZj6zPQ/s= +SHA256 (grafana-9.5.5.linux-amd64.tar.gz) = P6jlUiWtt+Wx80MiNhWz87x0E4cZTiiByAZPQ5yQFcw= +SIZE (grafana+vendor-9.5.5.tar.zst) = 44991187 +SIZE (grafana-9.5.5.linux-amd64.tar.gz) = 78771483 blob - b811f03bab4582b24057597af4b5e0d57a4ee512 blob + 4309c9657942814a5f09eaabb5efeeb5fc9d3e56 --- sysutils/grafana/patches/patch-conf_sample_ini +++ sysutils/grafana/patches/patch-conf_sample_ini @@ -25,7 +25,7 @@ Index: conf/sample.ini #################################### Server #################################### [server] -@@ -212,7 +212,7 @@ +@@ -237,7 +237,7 @@ # 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. @@ -34,7 +34,7 @@ Index: conf/sample.ini # The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs ;reporting_distributor = grafana-labs -@@ -222,7 +222,7 @@ +@@ -247,7 +247,7 @@ # in some UI views to notify that a grafana update exists. # This option does not cause any auto updates, nor send any information # only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version. @@ -43,7 +43,7 @@ Index: conf/sample.ini # Set to false to disable all checks to https://grafana.com # for new versions of plugins. The check is used -@@ -708,7 +708,7 @@ +@@ -784,7 +784,7 @@ [log] # Either "console", "file", "syslog". Default is console and file # Use space to separate multiple modes, e.g. "console file" blob - 4062d03af66aabe8c664f65409d67311dba4485f blob + 3ae19e087ab4862aac290866cbd155ef8643a088 --- sysutils/grafana/pkg/PLIST +++ sysutils/grafana/pkg/PLIST @@ -5139,8 +5139,8 @@ share/grafana/public/build/6749.dcda36f2155b00177c16.j share/grafana/public/build/6694.aa35f234ccbc910da743.js.map share/grafana/public/build/6747.d1b1a44ced46aa134bcc.js share/grafana/public/build/6747.d1b1a44ced46aa134bcc.js.map -share/grafana/public/build/6749.dcda36f2155b00177c16.js -share/grafana/public/build/6749.dcda36f2155b00177c16.js.map +share/grafana/public/build/6749.d5c478344c52ee6448bd.js +share/grafana/public/build/6749.d5c478344c52ee6448bd.js.map share/grafana/public/build/6797.3fa9657c48903eda5adf.js share/grafana/public/build/6797.3fa9657c48903eda5adf.js.map share/grafana/public/build/6847.7cd0ab849a12fcd296fc.js @@ -5392,12 +5392,12 @@ share/grafana/public/build/UserListPage.81772552d539a1 share/grafana/public/build/UserInvitePage.d74564b6b9efef2ed932.js.map share/grafana/public/build/UserListAdminPage.4b394a853da852298a22.js share/grafana/public/build/UserListAdminPage.4b394a853da852298a22.js.map -share/grafana/public/build/UserListPage.81772552d539a19ec0c7.js -share/grafana/public/build/UserListPage.81772552d539a19ec0c7.js.map +share/grafana/public/build/UserListPage.f30258939fe68cc4987a.js +share/grafana/public/build/UserListPage.f30258939fe68cc4987a.js.map share/grafana/public/build/UserProfileEditPage.75c2db541537e2bddb15.js share/grafana/public/build/UserProfileEditPage.75c2db541537e2bddb15.js.map -share/grafana/public/build/UsersListPage.d7e7fe45120d551f762e.js -share/grafana/public/build/UsersListPage.d7e7fe45120d551f762e.js.map +share/grafana/public/build/UsersListPage.f52d0d9da84fa4098304.js +share/grafana/public/build/UsersListPage.f52d0d9da84fa4098304.js.map share/grafana/public/build/alertmanagerPlugin.58ae70ad776c1e8ed465.js share/grafana/public/build/alertmanagerPlugin.58ae70ad776c1e8ed465.js.map share/grafana/public/build/app.c52aa5cf53b2693cadba.js @@ -5461,8 +5461,8 @@ share/grafana/public/build/runtime.9bb1d48427c59068187 share/grafana/public/build/prometheusPlugin.1f506f69e35af58ff9bc.js.map share/grafana/public/build/react-monaco-editor.93c7f2c9bcc12d3cabec.js share/grafana/public/build/react-monaco-editor.93c7f2c9bcc12d3cabec.js.map -share/grafana/public/build/runtime.9bb1d48427c59068187a.js -share/grafana/public/build/runtime.9bb1d48427c59068187a.js.map +share/grafana/public/build/runtime.a02778883930f3ba4558.js +share/grafana/public/build/runtime.a02778883930f3ba4558.js.map share/grafana/public/build/scenes.059d9c1ed1753c476a4a.js share/grafana/public/build/scenes.059d9c1ed1753c476a4a.js.map share/grafana/public/build/static/ @@ -7555,12 +7555,14 @@ share/grafana/public/lib/monaco/min/vs/language/kusto/ share/grafana/public/lib/monaco/min/vs/language/kusto/kustoMode.js.map share/grafana/public/lib/monaco/min/vs/language/kusto/kustoWorker.js share/grafana/public/lib/monaco/min/vs/language/kusto/kustoWorker.js.map -share/grafana/public/lib/monaco/min/vs/language/kusto/monaco.contribution.d.ts +share/grafana/public/lib/monaco/min/vs/language/kusto/main-34387646.js +share/grafana/public/lib/monaco/min/vs/language/kusto/main-34387646.js.map share/grafana/public/lib/monaco/min/vs/language/kusto/monaco.contribution.js share/grafana/public/lib/monaco/min/vs/language/kusto/monaco.contribution.js.map -share/grafana/public/lib/monaco/min/vs/language/kusto/monaco.d.ts share/grafana/public/lib/monaco/min/vs/language/kusto/newtonsoft.json.min.js share/grafana/public/lib/monaco/min/vs/language/kusto/newtonsoft.json.min.js.map +share/grafana/public/lib/monaco/min/vs/language/kusto/schema-cf674d5d.js +share/grafana/public/lib/monaco/min/vs/language/kusto/schema-cf674d5d.js.map share/grafana/public/lib/monaco/min/vs/language/typescript/ share/grafana/public/lib/monaco/min/vs/language/typescript/tsMode.js share/grafana/public/lib/monaco/min/vs/language/typescript/tsMode.js.map