Skip to content

PMM-2330: Annotations. #21

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.

Sign up for GitHub

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

Closed
arvenil wants to merge 3 commits into from
Closed

PMM-2330: Annotations. #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11f68b5
PMM-2330: Annotations.
arvenil Apr 9, 2018
0414b2b
PMM-2349 Annotations: Show annotations on Dashboards
adivinho Apr 9, 2018
e8b799d
PMM-2330 Added pmm-client with annotation command.
askomorokhov Apr 10, 2018
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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "pmm-client"]
path = sources/pmm-client/src/github.com/percona/pmm-client
url = https://github.com/percona/pmm-client.git
branch = master
branch = PMM-2348-annotations
[submodule "qan-agent"]
path = sources/qan-agent/src/github.com/percona/qan-agent
url = https://github.com/percona/qan-agent.git
Expand Down Expand Up @@ -33,7 +33,7 @@
[submodule "pmm-managed"]
path = sources/pmm-managed/src/github.com/percona/pmm-managed
url = https://github.com/percona/pmm-managed
branch = master
branch = PMM-2330_annotations_api
[submodule "qan-api"]
path = sources/qan-api/src/github.com/percona/qan-api
url = https://github.com/percona/qan-api
Expand All @@ -57,7 +57,7 @@
[submodule "grafana-dashboards"]
path = sources/grafana-dashboards
url = https://github.com/percona/grafana-dashboards
branch = master
branch = PMM-2349-Show-annotations-on-Dashboards
[submodule "rds_exporter"]
path = sources/rds_exporter/src/github.com/percona/rds_exporter
url = https://github.com/percona/rds_exporter
Expand Down
2 changes: 1 addition & 1 deletion sources/pmm-managed/src/github.com/percona/pmm-managed
Open in desktop
Submodule pmm-managed updated 31 files
+2 −0 .travis.yml
+211 −0 api/annotations.pb.go
+120 −0 api/annotations.pb.gw.go
+23 −0 api/annotations.proto
+4 −57 api/base.pb.go
+4 −4 api/demo.pb.go
+5 −5 api/logs.pb.go
+14 −14 api/rds.pb.go
+19 −19 api/scrape_configs.pb.go
+69 −0 api/swagger/annotations.swagger.json
+58 −0 api/swagger/client/annotations/annotations_client.go
+5 −5 api/swagger/client/annotations/create_parameters.go
+6 −4 api/swagger/client/annotations/create_responses.go
+7 −0 api/swagger/client/pmm_managed_client.go
+139 −0 api/swagger/client/scrape_configs/create_mixin4_parameters.go
+65 −0 api/swagger/client/scrape_configs/create_mixin4_responses.go
+0 −114 api/swagger/client/scrape_configs/list_mixin3_parameters.go
+114 −0 api/swagger/client/scrape_configs/list_mixin4_parameters.go
+12 −12 api/swagger/client/scrape_configs/list_mixin4_responses.go
+12 −12 api/swagger/client/scrape_configs/scrape_configs_client.go
+71 −0 api/swagger/models/api_annotations_create_request.go
+52 −0 api/swagger/models/api_annotations_create_response.go
+51 −3 api/swagger/swagger.json
+7 −2 cmd/pmm-managed/main.go
+199 −0 cmd/pmm-managed/main_test.go
+156 −0 cmd/pmm-managed/testdata/prometheus/prometheus.yml
+19 −0 cmd/pmm-managed/testdata/rds_exporter/rds_exporter.yml
+8 −2 docker-compose.yml
+63 −0 handlers/annotations.go
+6 −6 services/logs/logs.go
+6 −8 services/logs/logs_test.go