Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
3efd160
PMM-9146 small fixes
ademidoff Apr 4, 2025
2dad42f
PMM-9146 small fixes to infra code
ademidoff Apr 8, 2025
7549fa5
PMM-9146 pass the headers to QAN
ademidoff Apr 8, 2025
1e702fe
PMM-9146 bump up dependencies
ademidoff Apr 14, 2025
4d39b6f
PMM-9146 add uid to datasources and plugins
ademidoff Apr 14, 2025
2a7e399
PMM-9146 add LBAC filters to QAN queries
ademidoff Apr 14, 2025
97a5637
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Apr 14, 2025
3c3e301
PMM-9146 fix service names after rebase
ademidoff Apr 14, 2025
50ae64d
PMM-9146 comment out the logger
ademidoff Apr 14, 2025
c8313a9
PMM-9146 apply formatting
ademidoff Apr 14, 2025
9d90c93
PMM-9146 fix linter errors
ademidoff Apr 14, 2025
d9e0ca7
PMM-9146 fix linter errors
ademidoff Apr 14, 2025
794e4f2
PMM-9146 change the linter rule for errors
ademidoff Apr 14, 2025
31e2fd7
PMM-9146 fix linter errors
ademidoff Apr 14, 2025
684e191
PMM-9146 fix unit tests
ademidoff Apr 14, 2025
6785174
PMM-9146 fix profile unit tests
ademidoff Apr 14, 2025
e812e21
PMM-9146 fix linter error
ademidoff Apr 14, 2025
22e4b10
PMM-9146 fix Makefile formatting
ademidoff Apr 14, 2025
7225bf2
PMM-9146 semantic rename of a func
ademidoff Apr 14, 2025
e6ef531
PMM-9146 fix linter error
ademidoff Apr 14, 2025
f849d6f
PMM-9146 fix managed unit test
ademidoff Apr 14, 2025
a8c3a52
PMM-9146 rename the constant
ademidoff Apr 15, 2025
e178486
PMM-9146 fix regular and custom label queries
ademidoff Apr 15, 2025
7bd1339
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Apr 15, 2025
05acd4c
PMM-9146 fix linter error
ademidoff Apr 15, 2025
5ca1137
PMM-9146 fix linter errors
ademidoff Apr 15, 2025
4c4b795
PMM-9146 fix linter errors
ademidoff Apr 15, 2025
37bda62
PMM-9146 fix the duplicate column name
ademidoff Apr 16, 2025
e792758
PMM-9146 move IsDimention to models
ademidoff Apr 16, 2025
4d2248e
PMM-9146 optimize parantheses
ademidoff Apr 16, 2025
1756cfe
PMM-9146 fix unclosed parentheses
ademidoff Apr 16, 2025
7aff4eb
PMM-9146 remove unused function
ademidoff Apr 16, 2025
4f670c9
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Apr 17, 2025
3219d6d
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Apr 17, 2025
db93861
PMM-9146 clean up the code
ademidoff Apr 17, 2025
3a2e357
PMM-9146 add unit tests for LBAC methods
ademidoff Apr 18, 2025
40ae189
PMM-9146 small test related fixes
ademidoff Apr 18, 2025
35e6a48
PMM-9146 fix a linter error
ademidoff Apr 20, 2025
2817836
PMM-9146 fix sql indentation
ademidoff Apr 21, 2025
0ac43fc
Update qan-api2/services/analytics/filters_test.go
ademidoff Apr 21, 2025
c2ef595
PMM-9146 fix the test name
ademidoff Apr 21, 2025
2e11abb
Merge branch 'PMM-9146-lbac-for-qan' of ssh://github.com/percona/pmm …
ademidoff Apr 21, 2025
8215779
PMM-9146 follow up on PR review comments
ademidoff Apr 21, 2025
22fa0bf
PMM-9146 move the addition of datasource UIDs to a different PR
ademidoff Apr 21, 2025
b5ac42c
PMM-9146 cache the selectors and their sql repr
ademidoff Apr 22, 2025
190f9dc
PMM-9146 fix linter errors
ademidoff Apr 22, 2025
47494ea
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Apr 22, 2025
1c714fa
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Apr 25, 2025
1d04da9
PMM-9146 make a comment post-review
ademidoff Apr 26, 2025
87ae448
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff May 29, 2025
8351127
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff May 29, 2025
f0f0c1f
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff May 29, 2025
0c54938
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff May 29, 2025
2c19f94
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff May 29, 2025
fb2e8ea
Merge branch 'v3' into PMM-9146-lbac-for-qan
ademidoff Jun 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/qan-api2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up Go release
- name: Set up Go
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
with:
go-version-file: ${{ github.workspace }}/go.mod
Expand Down Expand Up @@ -79,8 +79,6 @@ jobs:
- name: Run debug commands on failure
if: ${{ failure() }}
run: |
env
go version
go env
pwd
env | sort
go env | sort
git status
4 changes: 2 additions & 2 deletions Makefile.devcontainer
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ run-qan: release-qan

run-all: run-agent run-managed ## Run pmm-managed and pmm-agent

run: ## Deprecated
echo "Deprecated: please use run-all"
run: run-all ## Aliased to "run-all"
echo "run is aliased to run-all"

# TODO https://jira.percona.com/browse/PMM-3484, see maincover_test.go
# run-race-cover: install-race ## Run pmm-managed with race detector and collect coverage information.
Expand Down
3 changes: 2 additions & 1 deletion build/ansible/roles/grafana/files/plugins.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apiVersion: 1

apps:
- type: pmm-app
- type: pmm-app
uid: pmm-app
1 change: 1 addition & 0 deletions build/ansible/roles/nginx/files/conf.d/pmm.conf
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@
proxy_pass http://qan-api-json/v1/qan;
proxy_http_version 1.1;
proxy_set_header Connection "";
proxy_set_header X-Proxy-Filter $auth_request_proxy_filter;
}

# compatibility with PMM 1.x
Expand Down
36 changes: 19 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ require (
github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/alecthomas/kingpin/v2 v2.4.0
github.com/alecthomas/kong v1.11.0
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
github.com/aws/aws-sdk-go v1.55.5
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b
github.com/aws/aws-sdk-go v1.55.7
github.com/blang/semver v3.5.1+incompatible
github.com/brianvoe/gofakeit/v6 v6.28.0
github.com/charmbracelet/bubbles v0.21.0
Expand All @@ -44,7 +44,7 @@ require (
github.com/grafana/grafana-api-golang-client v0.27.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
github.com/hashicorp/go-version v1.7.0
github.com/hashicorp/raft v1.7.0
github.com/jmoiron/sqlx v1.4.0
Expand All @@ -62,6 +62,7 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/prometheus/client_golang v1.22.0
github.com/prometheus/common v0.64.0
github.com/prometheus/prometheus v0.304.0
github.com/ramr/go-reaper v0.2.1
github.com/robfig/cron/v3 v3.0.1
github.com/sirupsen/logrus v1.9.3
Expand All @@ -75,9 +76,9 @@ require (
golang.org/x/sys v0.33.0
golang.org/x/text v0.25.0
golang.org/x/tools v0.33.0
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a
google.golang.org/grpc v1.72.0
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237
google.golang.org/grpc v1.72.1
google.golang.org/protobuf v1.36.6
gopkg.in/reform.v1 v1.5.1
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -91,21 +92,23 @@ require (
github.com/charmbracelet/x/ansi v0.8.0 // indirect
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
github.com/charmbracelet/x/term v0.2.1 // indirect
github.com/dennwc/varint v1.0.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a // indirect
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/hashicorp/go-hclog v1.6.2 // indirect
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
github.com/hashicorp/go-hclog v1.6.3 // indirect
github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/miekg/dns v1.1.26 // indirect
github.com/miekg/dns v1.1.65 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-proto-validators v0.3.2 // indirect
Expand All @@ -115,12 +118,11 @@ require (
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.36.0 // indirect
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/time v0.7.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
)
Expand Down Expand Up @@ -149,7 +151,7 @@ require (
github.com/go-openapi/loads v0.22.0 // indirect
github.com/go-openapi/spec v0.21.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/golang/snappy v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
Expand Down Expand Up @@ -195,8 +197,8 @@ require (
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.opentelemetry.io/otel v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/otel v1.36.0 // indirect
go.opentelemetry.io/otel/trace v1.36.0 // indirect
golang.org/x/mod v0.24.0 // indirect
golang.org/x/net v0.40.0 // indirect
gotest.tools/v3 v3.3.0 // indirect
Expand Down
Loading
Loading