Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* PMM-13483 Remove pmm-update.spec

* PMM-13483 Remove pmm-update package

* PMM-13483 Use same syntax

* PMM-13483 Rename pmm-update.log to pmm-init.log

* PMM-13483 Don't stop Grafana

* PMM-13483 Reorder the logs in the test

* PMM-13483 Start grafana only when it was successfully stopped

* PMM-13483 Rename pmm-update to pmm-init

* PMM-13483 Temp fix for grafana restart

* PMM-13483 Clean up .gitignore

* PMM-13483 Remove redundant when condition
  • Loading branch information
ademidoff authored Dec 28, 2024
1 parent b7885f1 commit ee9720f
Show file tree
Hide file tree
Showing 34 changed files with 45 additions and 1,601 deletions.
79 changes: 0 additions & 79 deletions .github/workflows/update.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ agent/agents/mysql/slowlog/parser/crashers/
agent/agents/mysql/slowlog/parser/suppressions/
agent/agents/mysql/slowlog/parser/parser-fuzz.zip

update/*.runcover.out
update/*.test

fuzzing/
*-fuzz.zip
*.bench
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ This project is built from several repositories:

* [percona/pmm-managed](https://github.com/percona/pmm/tree/main/managed) manages configuration of PMM server components (VictoriaMetrics, Grafana, etc.) and exposes API for that. APIs are used by [pmm-admin](https://github.com/percona/pmm/tree/main/admin)
* [percona/qan-api](https://github.com/percona/pmm/tree/main/qan-api2) query analytics API
* [percona/pmm-update](https://github.com/percona/pmm/tree/main/update) is a tool for updating packages and OS configuration for PMM

#### Frontends

Expand Down
2 changes: 1 addition & 1 deletion api-tests/server/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ func TestDownloadLogs(t *testing.T) {
"nginx.log",
"pmm-agent.log",
"pmm-agent.yaml",
"pmm-init.log",
"pmm-managed.log",
"pmm-ssl.conf",
"pmm-update-perform-init.log",
"pmm-version.txt",
"pmm.conf",
"pmm.ini",
Expand Down
2 changes: 1 addition & 1 deletion build/ansible/pmm-docker/init.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# This playbook gets executed by pmm-update-perform-init
# This playbook is run by the `pmm-init` supervisord process
- hosts: all
become: true
become_method: su
Expand Down
5 changes: 2 additions & 3 deletions build/ansible/roles/pmm-images/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
- percona-qan-api2
- percona-dashboards
- pmm-managed
- pmm-update
- pmm-dump
- vmproxy
state: installed
Expand Down Expand Up @@ -150,10 +149,10 @@
register: managed_init_result
changed_when: True

- name: Disable pmm-update-perform-init
- name: Disable pmm-init
ini_file:
path: /etc/supervisord.d/pmm.ini
section: program:pmm-update-perform-init
section: program:pmm-init
option: autostart
value: "false"

Expand Down
8 changes: 4 additions & 4 deletions build/ansible/roles/supervisord/files/pmm.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ username = dummy
password = dummy

; we rewrite autostart to true during update or build.
[program:pmm-update-perform-init]
command = /usr/sbin/pmm-update -run-playbook -playbook=/opt/ansible/pmm-docker/init.yml
[program:pmm-init]
command = /usr/bin/ansible-playbook /opt/ansible/pmm-docker/init.yml
user = pmm
directory = /
autorestart = unexpected
Expand All @@ -20,8 +20,8 @@ startretries = 3
startsecs = 1
stopsignal = TERM
stopwaitsecs = 300
stdout_logfile = /srv/logs/pmm-update-perform-init.log
stdout_logfile_maxbytes = 50MB
stdout_logfile = /srv/logs/pmm-init.log
stdout_logfile_maxbytes = 20MB
stdout_logfile_backups = 3
redirect_stderr = true

Expand Down
187 changes: 0 additions & 187 deletions build/packages/rpm/server/SPECS/pmm-update.spec

This file was deleted.

1 change: 0 additions & 1 deletion build/scripts/build-server-rpm-all
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ set -o xtrace
${bin_dir}/build-server-rpm percona-dashboards grafana-dashboards
${bin_dir}/build-server-rpm pmm-managed pmm
${bin_dir}/build-server-rpm percona-qan-api2 pmm
${bin_dir}/build-server-rpm pmm-update pmm
${bin_dir}/build-server-rpm pmm-dump
${bin_dir}/build-server-rpm vmproxy pmm

Expand Down
9 changes: 0 additions & 9 deletions build/scripts/utils/check-agent-setup.sh

This file was deleted.

3 changes: 0 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,6 @@ services:
- go-modules:/root/go/pkg/mod
- root-cache:/root/.cache
- ./managed/testdata/pg/certs/:/certs/
- ./update/ansible:/usr/share/pmm-update/ansible

pmm-server-passive:
profiles:
Expand Down Expand Up @@ -382,7 +381,6 @@ services:
- go-modules:/root/go/pkg/mod
- root-cache:/root/.cache
- ./managed/testdata/pg/certs/:/certs/
- ./update/ansible:/usr/share/pmm-update/ansible

pmm-server-passive-2:
profiles:
Expand Down Expand Up @@ -462,7 +460,6 @@ services:
- go-modules:/root/go/pkg/mod
- root-cache:/root/.cache
- ./managed/testdata/pg/certs/:/certs/
- ./update/ansible:/usr/share/pmm-update/ansible

volumes:
chdata: # Volume for ClickHouse data
Expand Down
2 changes: 1 addition & 1 deletion docs/api/pmm-server-config/troubleshooting/logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The downloaded logs package contains the following structure:
{
"codes": [
{
"code": "# tree\n├── clickhouse-server.err.log\n├── clickhouse-server.log\n├── clickhouse-server.startup.log\n├── client\n│ ├── list.txt\n│ ├── pmm-admin-version.txt\n│ ├── pmm-agent-config.yaml\n│ ├── pmm-agent-version.txt\n│ └── status.json\n├── cron.log\n├── dashboard-upgrade.log\n├── grafana.log\n├── installed.json\n├── nginx.conf\n├── nginx.log\n├── nginx.startup.log\n├── pmm-agent.log\n├── pmm-agent.yaml\n├── pmm-managed.log\n├── pmm-ssl.conf\n├── pmm-update-perform-init.log\n├── pmm-version.txt\n├── pmm.conf\n├── pmm.ini\n├── postgresql.log\n├── postgresql.startup.log\n├── prometheus.base.yml\n├── prometheus.log\n├── qan-api2.ini\n├── qan-api2.log\n├── supervisorctl_status.log\n├── supervisord.conf\n├── supervisord.log\n├── systemctl_status.log\n├── victoriametrics-promscrape.yml\n├── victoriametrics.ini\n├── victoriametrics.log\n├── victoriametrics_targets.json\n├── vmalert.ini\n└── vmalert.log",
"code": "# tree\n├── clickhouse-server.err.log\n├── clickhouse-server.log\n├── clickhouse-server.startup.log\n├── client\n│ ├── list.txt\n│ ├── pmm-admin-version.txt\n│ ├── pmm-agent-config.yaml\n│ ├── pmm-agent-version.txt\n│ └── status.json\n├── cron.log\n├── dashboard-upgrade.log\n├── grafana.log\n├── installed.json\n├── nginx.conf\n├── nginx.log\n├── nginx.startup.log\n├── pmm-agent.log\n├── pmm-agent.yaml\n├── pmm-managed.log\n├── pmm-ssl.conf\n├── pmm-init.log\n├── pmm-version.txt\n├── pmm.conf\n├── pmm.ini\n├── postgresql.log\n├── postgresql.startup.log\n├── prometheus.base.yml\n├── prometheus.log\n├── qan-api2.ini\n├── qan-api2.log\n├── supervisorctl_status.log\n├── supervisord.conf\n├── supervisord.log\n├── systemctl_status.log\n├── victoriametrics-promscrape.yml\n├── victoriametrics.ini\n├── victoriametrics.log\n├── victoriametrics_targets.json\n├── vmalert.ini\n└── vmalert.log",
"language": "text"
}
]
Expand Down
Loading

0 comments on commit ee9720f

Please sign in to comment.