Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grafana for openSUSE:Factory checked in at 2021-03-05 13:45:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grafana (Old) and /work/SRC/openSUSE:Factory/.grafana.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grafana" Fri Mar 5 13:45:35 2021 rev:16 rq:875411 version:7.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/grafana/grafana.changes 2021-02-25 18:26:52.790158753 +0100 +++ /work/SRC/openSUSE:Factory/.grafana.new.2378/grafana.changes 2021-03-05 13:46:38.443696610 +0100 @@ -1,0 +2,1152 @@ +Mon Feb 22 08:45:47 UTC 2021 - tser...@suse.com + +- Update to version 7.4.2: + * Make Datetime local (No date if today) working (#31274) (#31275) + * "Release: Updated versions in package to 7.4.2" (#31272) + * [v7.4.x] Chore: grafana-toolkit uses grafana-ui and grafana-data workspaces (#31269) + * Snapshots: Disallow anonymous user to create snapshots (#31263) (#31266) + * only update usagestats every 30min (#31131) (#31262) + * Prometheus: Fix enabling of disabled queries when editing in dashboard (#31055) (#31248) + * CloudWatch: Ensure empty query row errors are not passed to the panel (#31172) (#31245) + * StatPanels: Fixes to palette color scheme is not cleared when loading panel (#31126) (#31246) + * QueryEditors: Fixes issue that happens after moving queries then editing would update other queries (#31193) (#31244) + * LibraryPanels: Disconnect before connect during dashboard save (#31235) (#31238) + * SqlDataSources: Fixes the Show Generated SQL button in query editors (#31236) (#31239) + * Variables: Adds back default option for data source variable (#31208) (#31232) + * IPv6: Support host address configured with enclosing square brackets (#31226) (#31228) + * Postgres: Fix timeGroup macro converts long intervals to invalid numbers when TimescaleDB is enabled (#31179) (#31224) + * Remove last synchronisation field from LDAP debug view (#30984) (#31221) + * [v7.4.x]: Sync drone config from master to stable release branch (#31213) + * DataSourceSrv: Filter out non queryable data sources by default (#31144) (#31214) + * Alerting: Fix modal text for deleting obsolete notifier (#31171) (#31209) + * Variables: Fixes missing empty elements from regex filters (#31156) (#31201) + * DashboardLinks: Fixes links always cause full page reload (#31178) (#31181) + * DashboardListPanel: Fixes issue with folder picker always showing All and using old form styles (#31160) (#31162) + * Permissions: Fix team and role permissions on folders/dashboards not displayed for non Grafana Admin users (#31132) (#31176) + * Prometheus: Multiply exemplars timestamp to follow api change (#31143) (#31170) +- Added add-gotest-module.patch to fix "inconsistent vendoring" build failure + +------------------------------------------------------------------- +Wed Feb 17 06:06:04 UTC 2021 - tser...@suse.com + +- Update to version 7.4.1: + * "Release: Updated versions in package to 7.4.1" (#31128) + * Transforms: Fixes Outer join issue with duplicate field names not getting the same unique field names as before (#31121) (#31127) + * MuxWriter: Handle error for already closed file (#31119) (#31120) + * Logging: sourcemap transform asset urls from CDN in logged stacktraces (#31115) (#31117) + * Exemplars: Change CTA style (#30880) (#31105) + * test: add support for timeout to be passed in for addDatasource (#30736) (#31090) + * Influx: Make max series limit configurable and show the limiting message if applied (#31025) (#31100) + * Elasticsearch: fix log row context erroring out (#31088) (#31094) + * test: update addDashboard flow for v7.4.0 changes (#31059) (#31084) + * Usage stats: Adds source/distributor setting (#31039) (#31076) + * DashboardLinks: Fixes crash when link has no title (#31008) (#31050) + * Make value mappings correctly interpret numeric-like strings (#30893) (#30912) + * Elasticsearch: Fix alias field value not being shown in query editor (#30992) (#31037) + * BarGauge: Improvements to value sizing and table inner width calculations (#30990) (#31032) + * convert path to posix by default (#31045) (#31053) + * Alerting: Fixes so notification channels are properly deleted (#31040) (#31046) + * Drone: Fix deployment image (#31027) (#31029) + * Graph: Fixes so graph is shown for non numeric time values (#30972) (#31014) + * instrumentation: make the first database histogram bucket smaller (#30995) (#31001) + * Build: Releases e2e and e2e-selectors too (#31006) (#31007) + * TextPanel: Fixes so panel title is updated when variables change (#30884) (#31005) + * StatPanel: Fixes issue formatting date values using unit option (#30979) (#30991) + * Units: Fixes formatting of duration units (#30982) (#30986) + * Elasticsearch: Show Size setting for raw_data metric (#30980) (#30983) + * Logging: sourcemap support for frontend stacktraces (#30590) (#30976) + * e2e: extends selector factory to plugins (#30932) (#30934) + * Variables: Adds queryparam formatting option (#30858) (#30924) + * Exemplars: change api to reflect latest changes (#30910) (#30915) + * "Release: Updated versions in package to 7.4.0" (#30898) + * DataSourceSettings: Adds info box and link to Grafana Cloud (#30891) (#30896) + * GrafanaUI: Add a way to persistently close InfoBox (#30716) (#30895) + * [7.4.x] AlertingNG: List saved Alert definitions in Alert Rule list (30890)(30603) + * Alerting: Fixes alert panel header icon not showing (#30840) (#30885) + * Plugins: Requests validator (#30445) (#30877) + * PanelLibrary: Adds library panel meta information to dashboard json (#30770) (#30883) + * bump grabpl version to 0.5.36 (#30874) (#30878) + * Chore: remove __debug_bin (#30725) (#30857) + * Grafana-ui: fixes closing modals with escape key (#30745) (#30873) + * DashboardLinks: Support variable expression in to tooltip - Issue #30409 (#30569) (#30852) + * Add alt text to plugin logos (#30710) (#30872) + * InfluxDB: Add http configuration when selecting InfluxDB v2 flavor (#30827) (#30870) + * Prometheus: Set type of labels to string (#30831) (#30835) + * AlertingNG: change API permissions (#30781) (#30814) + * Grafana-ui: fixes no data message in Table component (#30821) (#30855) + * Prometheus: Add tooltip to explain possibility to use patterns in text and title fields in annotations (#30825) (#30843) + * Chore: add more docs annotations (#30847) (#30851) + * BarChart: inside-align strokes, upgrade uPlot to 1.6.4. (#30806) (#30846) + * Transforms: allow boolean in field calculations (#30802) (#30845) + * CDN: Fixes cdn path when Grafana is under sub path (#30822) (#30823) + * bump cypress to 6.3.0 (#30644) (#30819) + * Expressions: Measure total transformation requests and elapsed time (#30514) (#30789) + * Grafana-UI: Add story/docs for ErrorBoundary (#30304) (#30811) + * [v7.4.x]: Menu: Mark menu components as internal (#30801) + * Graph: Fixes auto decimals issue in legend and tooltip (#30628) (#30635) + * GraphNG: Disable Plot logging by default (#30390) (#30500) + * Storybook: Migrate card story to use controls (#30535) (#30549) + * GraphNG: add bar alignment option (#30499) (#30790) + * Variables: Clears drop down state when leaving dashboard (#30810) (#30812) + * Add missing callback dependency (#30797) (#30809) + * GraphNG: improve behavior when switching between solid/dash/dots (#30796) (#30799) + * Add width for Variable Editors (#30791) (#30795) + * Panels: Fixes so panels are refreshed when scrolling past them fast (#30784) (#30792) + * PanelEdit: Trigger refresh when changing data source (#30744) (#30767) + * AlertingNG: Enable UI to Save Alert Definitions (#30394) (#30548) + * CDN: Fix passing correct prefix to GetContentDeliveryURL (#30777) (#30779) + * CDN: Adds support for serving assets over a CDN (#30691) (#30776) + * Explore: Update styling of buttons (#30493) (#30508) + * Loki: Append refId to logs uid (#30418) (#30537) + * skip symlinks to directories when generating plugin manifest (#30721) (#30738) + * Mobile: Fixes issue scrolling on mobile in chrome (#30746) (#30750) + * BarChart: add alpha bar chart panel (#30323) (#30754) + * Datasource: Use json-iterator configuration compatible with standard library (#30732) (#30739) + * Variables: Fixes so text format will show All instead of custom all (#30730) (#30731) + * AlertingNG: pause/unpause definitions via the API (#30627) (#30672) + * PanelLibrary: better handling of deleted panels (#30709) (#30726) + * Transform: improve the "outer join" performance/behavior (#30407) (#30722) + * DashboardPicker: switch to promise-based debounce, return dashboard UID (#30706) (#30714) + * Use connected GraphNG in Explore (#30707) (#30708) + * PanelLibrary: changes casing of responses and adds meta property (#30668) (#30711) + * DeployImage: Switch base images to Debian (#30684) (#30699) + * Trace: trace to logs design update (#30637) (#30702) + * Influx: Show all datapoints for dynamically windowed flux query (#30688) (#30703) + * ci(npm-publish): add missing github package token to env vars (#30665) (#30673) + * Loki: Improve live tailing errors and fix Explore's logs container type errors (#30517) (#30681) + * Grafana-UI: Fix setting default value for MultiSelect (#30671) (#30687) + * Explore: Fix jumpy live tailing (#30650) (#30677) + * Docs: Refer to product docs in whats new for alerting templating feature (#30652) (#30670) + * Variables: Fixes display value when using capture groups in regex (#30636) (#30661) + * Docs: Fix expressions enabled description (#30589) (#30651) + * Licensing Docs: Adding license restrictions docs (#30216) (#30648) + * DashboardSettings: fixes vertical scrolling (#30640) (#30643) + * chore: bump redux toolkit to 1.5.0 for immer 8.0.1 vulnerability fix (#30605) (#30631) + * Explore: Fix loading visualisation on the top of the new time series panel (#30553) (#30557) + * Footer: Fixes layout issue in footer (#30443) (#30494) + * Variables: Fixes so queries work for numbers values too (#30602) (#30624) + * Admin: Fixes so form values are filled in from backend (#30544) (#30623) + * Docs: Update 7.4 What's New to use more correct description of alerting notification template feature (#30502) (#30614) + * NodeGraph: Add docs (#30504) (#30613) + * Cloud Monitoring: Fix legend naming with display name override (#30440) (#30503) + * Expressions: Add option to disable feature (#30541) (#30558) + * OldGraph: Fix height issue in Firefox (#30565) (#30582) + * XY Chart: fix editor error with empty frame (no fields) (#30573) (#30577) + * XY Chart: share legend config with timeseries (#30559) (#30566) + * DataFrame: cache frame/field index in field state (#30529) (#30560) + * Prometheus: Fix show query instead of Value if no __name__ and metric (#30511) (#30556) + * Decimals: Big Improvements to auto decimals and fixes to auto decimals bug found in 7.4-beta1 (#30519) (#30550) + * chore: update packages dependent on dot-prop to fix security vulnerability (#30432) (#30487) + * GraphNG: uPlot 1.6.3 (fix bands not filling below 0). close #30523. (#30527) (#30528) + * GraphNG: uPlot 1.6.2 (#30521) (#30522) + * Chore: Upgrade grabpl version (#30486) (#30513) + * grafana/ui: Fix internal import from grafana/data (#30439) (#30507) + * prevent field config from being overwritten (#30437) (#30442) + * Chore: upgrade NPM security vulnerabilities (#30397) (#30495) + * TimeSeriesPanel: Fixed default value for gradientMode (#30484) (#30492) + * Admin: Fixes so whole org drop down is visible when adding users to org (#30481) (#30497) + * Chore: adds wait to e2e test (#30488) (#30490) + * Graph: Fixes so only users with correct permissions can add annotations (#30419) (#30466) + * Alerting: Hides threshold handle for percentual thresholds (#30431) (#30467) + * Timeseries: only migrage point size when configured (#30461) (#30470) + * Expressions: Fix button icon (#30444) (#30450) + * PanelModel: Make sure the angular options are passed to react panel type changed handler (#30441) (#30451) + * Docs: Fix img link for alert notification template (#30436) (#30447) + * Chore: Upgrade build pipeline tool (#30456) (#30457) + * PanelOptions: Refactoring applying panel and field options out of PanelModel and add property clean up for properties not in field config registry (#30389) (#30438) + * "Release: Updated versions in package to 7.4.0-beta.1" (#30427) + * Chore: Update what's new URL (#30423) + * GraphNG: assume uPlot's series stroke is always a function (#30416) + * PanelLibrary: adding library panels to Dashboard Api (#30278) + * Prettier: Fixes to files that came in after main upgrade (#30410) + * Cloud Monitoring: Add curated dashboards for the most popular GCP services (#29930) + * Mssql integrated security (#30369) + * Prettier: Upgrade to 2 (#30387) + * GraphNG: sort ascending if the values appear reversed (#30405) + * Docs: Grafana whats new 7.4 (#30404) + * Dashboards: Adds cheat sheet toggle to supported query editors (#28857) + * Docs: Update timeseries-dimensions.md (#30403) + * Alerting: Evaluate data templating in alert rule name and message (#29908) + * Docs: Add links to 7.3 patch release notes (#30292) + * Docs: Update _index.md (#29546) + * Docs: Update jaeger.md (#30401) + * Expressions: Remove feature toggle (#30316) + * Docs: Update tempo.md (#30399) + * Docs: Update zipkin.md (#30400) + * services/provisioning: Various cleanup (#30396) + * DashboardSchemas: OpenAPI Schema Generation (#30242) + * AlertingNG: Enforce unique alert definition title (non empty)/UID per organisation (#30380) + * Licensing: Document new v7.4 options and APIs (#30217) + * Auth: add expired token error and update CreateToken function (#30203) + * NodeGraph: Add node graph visualization (#29706) + * Add jwtTokenAuth to plugin metadata schema (#30346) + * Plugins: Force POSIX style path separators for manifest generation (#30287) + * Add enterprise reporting fonts to gitignore (#30385) + * Field overrides: skipping overrides for properties no longer existing in plugin (#30197) + * NgAlerting: View query result (#30218) + * Grafana-UI: Make Card story public (#30388) + * Dashboard: migrate version history list (#29970) + * Search: use Card component (#29892) + * PanelEvents: Isolate more for old angular query editors (#30379) + * Loki: Remove showing of unique labels with the empty string value (#30363) + * Chore: Lint all files for no-only-tests (#30364) + * Clears errors after running new query (#30367) + * Prometheus: Change exemplars endpoint (#30378) + * Explore: Fix a bug where Typeahead crashes when a large amount of ite??? (#29637) + * Circular vector: improve generics (#30375) + * Update signing docs (#30296) ++++ 955 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/grafana/grafana.changes ++++ and /work/SRC/openSUSE:Factory/.grafana.new.2378/grafana.changes Old: ---- grafana-7.3.6.tar.gz New: ---- add-gotest-module.patch grafana-7.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grafana.spec ++++++ --- /var/tmp/diff_new_pack.jZkRTa/_old 2021-03-05 13:46:59.543715790 +0100 +++ /var/tmp/diff_new_pack.jZkRTa/_new 2021-03-05 13:46:59.547715794 +0100 @@ -22,7 +22,7 @@ %endif Name: grafana -Version: 7.3.6 +Version: 7.4.2 Release: 0 Summary: The open-source platform for monitoring and observability. License: Apache-2.0 @@ -35,6 +35,18 @@ Source3: README # Makefile to automate build process Source4: Makefile +# This patch is needed because upstream commit c8a7044 added an import +# of gotest.tools/assert, but go.mod wasn't updated to also include this +# dependency, which breaks vendoring when building RPMs on OBS. This +# will be fixed in a different way upstream in the next 7.4.x release +# (see https://github.com/grafana/grafana/pull/31395), but we can't +# use that patch here, because it won't be taken into account when +# the go_modules source service is run, so we'll still end up with +# modules.txt in vendor.tar.gz not matching go.dep in the source +# tarball +# TL;DR: To whoever does the next version bump of grafana, make sure +# you drop this patch. For any questions, hassle tser...@suse.com. +Patch1: add-gotest-module.patch BuildRequires: fdupes BuildRequires: git-core BuildRequires: golang-packaging @@ -62,6 +74,7 @@ %prep %setup -q -n grafana-%{version} %setup -q -T -D -a 1 -n grafana-%{version} +%patch1 -p1 %build %goprep github.com/grafana/grafana ++++++ Makefile ++++++ --- /var/tmp/diff_new_pack.jZkRTa/_old 2021-03-05 13:46:59.575715819 +0100 +++ /var/tmp/diff_new_pack.jZkRTa/_new 2021-03-05 13:46:59.575715819 +0100 @@ -5,7 +5,6 @@ verify-deps: @which yarn >/dev/null 2>&1 || ( echo "yarn not found; run \`sudo npm install -g yarn\`" && false ) - @which grunt >/dev/null 2>&1 || ( echo "grunt not found; run \`sudo npm install -g grunt-cli\`" && false ) clean: rm -f $(NAME)-*.tar $(NAME)-*.tar.gz @@ -20,17 +19,17 @@ cd $$tmpdir && \ gunzip ../$$tar.gz && \ tar -xf ../$$tar && \ + # recreate tarball explicitly in a format that handles long filenames \ + tar --format=posix -cf ../$$tar $$basename && \ cd $$basename && \ # Patches for the JS frontend go after here \ # No patches currently needed \ # End patches section \ yarn install --pure-lockfile && \ - grunt release && \ - cp -pr tmp/public . && \ - cp -pr tmp/tools . && \ + yarn run build && \ cd .. && \ - echo "Updating $$basename/tools $$basename/public in tarball..." && \ - tar -rf ../$$tar $$basename/tools $$basename/public && \ + echo "Updating $$basename/public in tarball..." && \ + tar -rf ../$$tar $$basename/public && \ cd .. && \ gzip $$tar && \ rm -rf $$tmpdir ++++++ README ++++++ --- /var/tmp/diff_new_pack.jZkRTa/_old 2021-03-05 13:46:59.591715834 +0100 +++ /var/tmp/diff_new_pack.jZkRTa/_new 2021-03-05 13:46:59.595715837 +0100 @@ -1,27 +1,25 @@ The tarball is generated via the OBS source service, but Grafana needs to ship the compiled frontend assets as well, which have to -be built by running yarn and grunt inside the source tree (see -https://github.com/grafana/grafana#building-frontend-assets). +be built by running yarn inside the source tree (see +https://github.com/grafana/grafana/blob/master/contribute/developer-guide.md#frontend). This can't be done at build time on OBS, because it involves downloading and installing packages from the internet, so instead we have a Makefile which does the following: - Runs `osc service disabledrun` to get the latest source tarball - Unpacks the tarball to a temporary directory -- Runs `yarn install --pure-lockfile && grunt release` +- Runs `yarn install --pure-lockfile && yarn build` - Adds the generated "vendor" and "public" content to the tarball, then compresses it with xz. - The tarball can then be used by OBS to build an RPM. -In order for this to work you need to have npm >= 6, < 12, yarn and -grunt installed. To get set up, run: +In order for this to work you need to have npm >= 14 and yarn installed. - # zypper in npm12 + # zypper in npm14 # zypper in obs-service-download_files obs-service-go_modules \ obs-service-obs_scm # npm install -g yarn - # npm install -g grunt-cli Then, to package a new release of Grafana, run `make` then `osc ci` and you should be good. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.jZkRTa/_old 2021-03-05 13:46:59.607715848 +0100 +++ /var/tmp/diff_new_pack.jZkRTa/_new 2021-03-05 13:46:59.607715848 +0100 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">v7.3.6</param> + <param name="revision">v7.4.2</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.jZkRTa/_old 2021-03-05 13:46:59.623715863 +0100 +++ /var/tmp/diff_new_pack.jZkRTa/_new 2021-03-05 13:46:59.623715863 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/grafana/grafana</param> - <param name="changesrevision">f25d63954b2593e1cd11eafb5ca929900a9f2e66</param> + <param name="changesrevision">29e75ad97b61f09f4880e3d3adbda810bfbf5dbf</param> </service> </servicedata> \ No newline at end of file ++++++ add-gotest-module.patch ++++++ diff --git a/go.mod b/go.mod index ea2a2c0da1..0ab22b1da9 100644 --- a/go.mod +++ b/go.mod @@ -101,6 +101,7 @@ require ( gopkg.in/redis.v5 v5.2.9 gopkg.in/square/go-jose.v2 v2.5.1 gopkg.in/yaml.v2 v2.3.0 + gotest.tools v2.2.0+incompatible xorm.io/core v0.7.3 xorm.io/xorm v0.8.1 ) ++++++ grafana-7.3.6.tar.gz -> grafana-7.4.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/grafana/grafana-7.3.6.tar.gz /work/SRC/openSUSE:Factory/.grafana.new.2378/grafana-7.4.2.tar.gz differ: char 5, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/grafana/vendor.tar.gz /work/SRC/openSUSE:Factory/.grafana.new.2378/vendor.tar.gz differ: char 5, line 1
