Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search: Include collapsed panels in search v2 #83047

Merged
merged 2 commits into from
Feb 28, 2024

Conversation

suntala
Copy link
Contributor

@suntala suntala commented Feb 19, 2024

What is this feature?

This is a bug fix for panel title search in search v2.

Why do we need this feature?

Panels in collapsed rows are currently not being included in panel title search in search v2. This PR fixes this bug.

Who is this feature for?

Users with the panelTitleSearch feature flag enabled.

Which issue(s) does this PR fix?:

Fix for https://github.com/grafana/support-escalations/issues/9284

Special notes for your reviewer:
This is my understanding of how TestReadSummaries works. (1) It takes the with-library-panels.json and reads it. (2) The output of what is being read is expected to match the contents of with-library-panels-info.json.

As part of this PR, I added a new collapsed row and panel to with-library-panels.json. During the reading process, the other panels get a "ds" reference even though they themselves don't contain a datasource field. The new panel I added doesn't get a "ds" reference unless I directly include a datasource field in with-library-panels.json.

This didn't seem like a key aspect of the test to me, but happy to look further into it if someone thinks it would be worthwhile to do so.

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.4.x milestone Feb 19, 2024
@suntala suntala added no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes labels Feb 19, 2024
@suntala suntala added type/bug add to changelog and removed no-changelog Skip including change in changelog/release notes labels Feb 19, 2024
@suntala suntala marked this pull request as ready for review February 19, 2024 12:56
@suntala suntala requested a review from a team as a code owner February 19, 2024 12:56
@aangelisc aangelisc modified the milestones: 10.4.x, 11.0.x Feb 20, 2024
@inf0rmer
Copy link
Contributor

/deploy-to-hg

@ephemeral-instances-bot
Copy link

  • Preparing your instance. A comment containing your instance's url will be added to this PR when the instance is ready.
  • Your instance will be ready in ~10 minutes.
  • Check the GitHub actions tab to follow the workflow progress
  • Slack channel: #proj-ephemeral-hg-instances
  • Building instance with suntala/fix-panel-search-collapsed-row oss branch and main enterprise branch. How to choose a branch

@ephemeral-instances-bot
Copy link

Error: Contact #proj-ephemeral-hg-instances if it is not a compile error

handling pull request comment event: running grafana-build deb: executing command: stdout= stderr=go: downloading dagger.io/dagger v0.9.8
go: downloading github.com/urfave/cli/v2 v2.25.7
go: downloading go.opentelemetry.io/otel v1.18.0
go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0
go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0
go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0
go: downloading go.opentelemetry.io/otel/sdk v1.18.0
go: downloading go.opentelemetry.io/otel/trace v1.18.0
go: downloading golang.org/x/sync v0.6.0
go: downloading github.com/Khan/genqlient v0.6.0
go: downloading github.com/vektah/gqlparser/v2 v2.5.6
go: downloading go.opentelemetry.io/proto/otlp v1.0.0
go: downloading google.golang.org/protobuf v1.31.0
go: downloading github.com/go-logr/logr v1.2.4
go: downloading go.opentelemetry.io/otel/metric v1.18.0
go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98
go: downloading google.golang.org/grpc v1.58.0
go: downloading golang.org/x/sys v0.14.0
go: downloading github.com/adrg/xdg v0.4.0
go: downloading github.com/mitchellh/go-homedir v1.1.0
go: downloading github.com/99designs/gqlgen v0.17.31
go: downloading golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
go: downloading github.com/cenkalti/backoff/v4 v4.2.1
go: downloading github.com/cpuguy83/go-md2man/v2 v2.0.2
go: downloading github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673
go: downloading github.com/go-logr/stdr v1.2.2
go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
go: downloading github.com/Masterminds/semver v1.5.0
go: downloading github.com/golang/protobuf v1.5.3
go: downloading golang.org/x/net v0.12.0
go: downloading github.com/russross/blackfriday/v2 v2.1.0
go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98
go: downloading golang.org/x/text v0.11.0
2024/02/27 08:37:19 OTEL_EXPORTER_OTLP_ENDPOINT not set. Disabling tracing.
time=2024-02-27T08:37:28.158Z level=INFO msg="Initializing tar.gz artifact with options" name=grafana-pro "build ID"=12345 version=10.1.0 distro=linux/amd64/dynamic static=false enterprise=true
2024/02/27 08:37:28 if git -C src checkout suntala/fix-panel-search-collapsed-row; then echo "checked out suntala/fix-panel-search-collapsed-row"; else exit 3; fi
2024/02/27 08:40:26 if git -C src checkout main; then echo "checked out main"; else exit 3; fi
time=2024-02-27T08:40:30.483Z level=INFO msg="Initializing backend artifact with options" static=false version=10.1.0 name=grafana-pro distro=linux/amd64/dynamic
2024/02/27 08:40:30 if git -C src checkout suntala/fix-panel-search-collapsed-row; then echo "checked out suntala/fix-panel-search-collapsed-row"; else exit 3; fi
time=2024-02-27T08:40:30.501Z level=INFO msg="Adding artifact to dag..." filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb artifact=deb:pro:linux/amd64/dynamic
time=2024-02-27T08:40:30.501Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler count=1
time=2024-02-27T08:40:30.501Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler count=5
time=2024-02-27T08:40:30.501Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler count=0
time=2024-02-27T08:40:30.501Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
2024/02/27 08:40:30 Building with command 'if [ -d pkg/cmd/grafana ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana -trimpath -tags=osusergo,pro ./pkg/cmd/grafana; fi'
2024/02/27 08:40:30 Building with command 'if [ -d pkg/cmd/grafana-server ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana-server -trimpath -tags=osusergo,pro ./pkg/cmd/grafana-server; fi'
2024/02/27 08:40:30 Building with command 'if [ -d pkg/cmd/grafana-cli ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana-cli -trimpath -tags=osusergo,pro ./pkg/cmd/grafana-cli; fi'
2024/02/27 08:40:30 Building with command 'if [ -d pkg/cmd/grafana-example-apiserver ]; then go build -ldflags="-X "main.version=10.1.0" -X "main.commit=$(cat ./.buildinfo.commit)" -X "main.buildBranch=$(cat ./.buildinfo.branch)" -X "main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana-example-apiserver -trimpath -tags=osusergo,pro ./pkg/cmd/grafana-example-apiserver; fi'
time=2024-02-27T08:40:30.501Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=bin/grafana-pro/linux/amd64/dynamic service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="getting dependencies..." artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-02-27T08:40:30.501Z level=INFO msg="got dependencies" artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler count=0
time=2024-02-27T08:40:30.501Z level=INFO msg="getting builder..." artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-02-27T08:41:13.417Z level=INFO msg="got builder" artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-02-27T08:41:13.417Z level=INFO msg="building directory..." artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-02-27T08:41:13.417Z level=INFO msg="done building directory" artifact=10.1.0 filename=deb:pro:linux/amd64/dynamic/grafana-enterprise/public service=ArtifactHandler
time=2024-02-27T08:41:13.417Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-02-27T08:41:13.417Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler count=0
time=2024-02-27T08:41:13.417Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-02-27T08:41:13.435Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-02-27T08:41:13.435Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-02-27T08:41:13.435Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/npm-packages service=ArtifactHandler
time=2024-02-27T08:41:13.435Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-02-27T08:41:13.435Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler count=0
time=2024-02-27T08:41:13.435Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-02-27T08:41:13.452Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-02-27T08:41:13.452Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-02-27T08:41:13.452Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=bin/bundled-plugins service=ArtifactHandler
time=2024-02-27T08:41:13.452Z level=INFO msg="getting dependencies..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-02-27T08:41:13.452Z level=INFO msg="got dependencies" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler count=0
time=2024-02-27T08:41:13.452Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="building directory..." artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="done building directory" artifact=deb:pro:linux/amd64/dynamic filename=10.1.0/storybook service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="building file..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="done building file" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.tar.gz service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="getting builder..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="got builder" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="building file..." artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="done building file" artifact=deb:pro:linux/amd64/dynamic filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb service=ArtifactHandler
time=2024-02-27T08:41:13.465Z level=INFO msg="Done adding artifact" filename=grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb artifact=deb:pro:linux/amd64/dynamic
time=2024-02-27T08:41:13.465Z level=INFO msg="Exporting artifacts..."
time=2024-02-27T08:41:13.466Z level=INFO msg="Started exporting artifact..." artifact=deb:pro:linux/amd64/dynamic action=export
time=2024-02-27T08:41:13.466Z level=INFO msg="Acquiring semaphore" artifact=deb:pro:linux/amd64/dynamic action=export
time=2024-02-27T08:41:13.466Z level=INFO msg="Acquired semaphore" artifact=deb:pro:linux/amd64/dynamic action=export
time=2024-02-27T08:41:13.466Z level=INFO msg="Exporting artifact" artifact=deb:pro:linux/amd64/dynamic action=export
error exporting artifact 'grafana-pro_10.1.0_12345_linux_amd64-dynamic.deb': input: resolve: container: from: withExec: withExec: withExec: withExec: withExec: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withDirectory: withDirectory: withDirectory: withDirectory: withFile: withDirectory: withDirectory: withDirectory: withFile: withFile: withWorkdir: withFile: withMountedCache: withFile: withFile: withFile: withExec: withExec: withExec: withExec: directory: process "/bin/sh -c if [ -d pkg/cmd/grafana ]; then go build -ldflags="-X \"main.version=10.1.0\" -X \"main.commit=$(cat ./.buildinfo.commit)\" -X \"main.buildBranch=$(cat ./.buildinfo.branch)\" -X \"main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)\" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana -trimpath -tags=osusergo,pro ./pkg/cmd/grafana; fi" did not complete successfully: exit code: 1
input: resolve: container: from: withExec: withExec: withExec: withExec: withExec: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withEnvVariable: withDirectory: withDirectory: withDirectory: withDirectory: withFile: withDirectory: withDirectory: withDirectory: withFile: withFile: withWorkdir: withFile: withMountedCache: withFile: withFile: withFile: withExec: withExec: withExec: withExec: directory: process "/bin/sh -c if [ -d pkg/cmd/grafana ]; then go build -ldflags="-X \"main.version=10.1.0\" -X \"main.commit=$(cat ./.buildinfo.commit)\" -X \"main.buildBranch=$(cat ./.buildinfo.branch)\" -X \"main.enterpriseCommit=$(cat ./.buildinfo.enterprise-commit)\" " -o=bin/grafana-pro/linux/amd64/dynamic/grafana -trimpath -tags=osusergo,pro ./pkg/cmd/grafana; fi" did not complete successfully: exit code: 1

Stdout:

Stderr:
pkg/extensions/apiserver/standalone/factory.go:12:2: no required module provides package github.com/grafana/grafana/pkg/apiserver/builder; to add it:
go get github.com/grafana/grafana/pkg/apiserver/builder
pkg/extensions/apiserver/hg/cloudconfig/datasource.go:13:2: no required module provides package github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1; to add it:
go get github.com/grafana/grafana/pkg/apimachinery/apis/common/v0alpha1
exit status 1
exit status 1

@suntala suntala force-pushed the suntala/fix-panel-search-collapsed-row branch from 9d002c4 to 03959a6 Compare February 27, 2024 10:44
@suntala
Copy link
Contributor Author

suntala commented Feb 27, 2024

/deploy-to-hg

@ephemeral-instances-bot
Copy link

  • Preparing your instance. A comment containing your instance's url will be added to this PR when the instance is ready.
  • Your instance will be ready in ~10 minutes.
  • Check the GitHub actions tab to follow the workflow progress
  • Slack channel: #proj-ephemeral-hg-instances
  • Building instance with suntala/fix-panel-search-collapsed-row oss branch and main enterprise branch. How to choose a branch

@ephemeral-instances-bot
Copy link

@suntala suntala merged commit 4673024 into main Feb 28, 2024
12 checks passed
@suntala suntala deleted the suntala/fix-panel-search-collapsed-row branch February 28, 2024 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants