PMM-11658 move the exporter configs away from /tmp #2341

ademidoff · 2023-07-03T13:32:40Z

Link to the Feature Build: SUBMODULES-3336

Other PRs:
Percona-Lab/jenkins-pipelines#2213

ademidoff · 2023-07-03T13:33:20Z

.github/workflows/admin.yml

@@ -126,7 +126,6 @@ jobs:

      - name: Setup tools
        run: |
-          sudo apt-get install -y wget jq


This was redundant as both binaries are already installed by default.

codecov · 2023-07-03T13:36:35Z

Codecov Report

Merging #2341 (bf45cfa) into main (b8ead6d) will decrease coverage by 0.04%.
The diff coverage is 41.17%.

@@            Coverage Diff             @@
##             main    #2341      +/-   ##
==========================================
- Coverage   42.94%   42.91%   -0.04%     
==========================================
  Files         385      385              
  Lines       48147    48167      +20     
==========================================
- Hits        20677    20671       -6     
- Misses      25535    25557      +22     
- Partials     1935     1939       +4

Flag	Coverage Δ
admin	`10.45% <ø> (+0.04%)`	⬆️
agent	`52.69% <58.33%> (-0.13%)`	⬇️
vmproxy	`69.69% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
agent/commands/run.go	`0.00% <0.00%> (ø)`
managed/cmd/pmm-managed/main.go	`0.00% <0.00%> (ø)`
agent/agents/supervisor/supervisor.go	`57.25% <50.00%> (-0.17%)`	⬇️
agent/config/config.go	`81.51% <84.61%> (+0.40%)`	⬆️

... and 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

ademidoff · 2023-07-03T13:41:44Z

managed/cmd/pmm-managed/main.go

@@ -596,9 +597,14 @@ func setup(ctx context.Context, deps *setupDeps) bool {
 }

 func getQANClient(ctx context.Context, sqlDB *sql.DB, dbName, qanAPIAddr string) *qan.Client {
+	bc := backoff.DefaultConfig


This migrates from the deprecated grpc.WithBackoffMaxDelay.

ademidoff · 2023-07-03T13:43:41Z

managed/cmd/pmm-managed/main.go

@@ -558,15 +559,15 @@ func setup(ctx context.Context, deps *setupDeps) bool {
 	deps.l.Infof("Updating supervisord configuration...")
 	settings, err := models.GetSettings(db.Querier)
 	if err != nil {
-		deps.l.Warnf("Failed to get settings: %+v.", err)
+		deps.l.Warnf("Failed to get settings: %s.", err)


It was a bit weird to see a part of the stack trace printed at the start of pmm-managed. Done like this, it will only print a clean error message.

[2023-06-26T14:35:15.947+00:00] Failed to get Percona SSO Details: PMM Server is not connected to Portal github.com/percona/pmm/managed/models.init /home/builder/rpm/BUILD/pmm-7a7431afdc35098f665dbd8d33ccf914fad8b0b5/src/github.com/percona/pmm/managed/models/percona_sso_model_helpers.go:35 runtime.doInit /usr/local/go/src/runtime/proc.go:6507 runtime.doInit /usr/local/go/src/runtime/proc.go:6484 runtime.main /usr/local/go/src/runtime/proc.go:233 runtime.goexit /usr/local/go/src/runtime/asm_amd64.s:1598. component=setup

agent/config/config.go

.golangci.yml

ademidoff · 2023-07-03T15:01:36Z

agent/config/config.go

@@ -474,7 +489,7 @@ func Application(cfg *Config) (*kingpin.Application, *string) {
 // Other errors are returned if file exists, but configuration can't be loaded due to permission problems,
 // YAML parsing problems, etc.
 func loadFromFile(path string) (*Config, error) {
-	if _, err := os.Stat(path); os.IsNotExist(err) {
+	if _, err := os.Stat(path); errors.Is(err, fs.ErrNotExist) {


os.IsNotExist is deprecated

agent/config/config_test.go

PMM_11658 change the message wording

PMM-11658 remove a debug statement PMM-11658 format the code PMM-11658 fix a linter error

PMM-11658 skip the failing test PMM-11658 print some debug info

PMM-11658 print more debug info

PMM-11658 format the code

agent/config/config.go

agent/config/config_test.go

ademidoff · 2023-07-10T00:05:30Z

build/docker/server/Dockerfile.el9

@@ -6,6 +6,7 @@ ARG BUILD_DATE
 ENV LANG=en_US.utf8
 ENV LC_ALL=en_US.utf8
 ENV GF_PLUGIN_DIR=/srv/grafana/plugins
+ENV PS1="[\u@\h \W]\$ "


Make the shell prompt more informative.
Before: bash-5.1#
Now: [root@pmm-server pmm] #

agent/agents/supervisor/supervisor.go

agent/config/config.go

.golangci.yml

agent/config/config.go

BupycHuk

Great job

ademidoff commented Jul 3, 2023

View reviewed changes

github-actions bot reviewed Jul 3, 2023

View reviewed changes

agent/config/config.go Outdated Show resolved Hide resolved

ademidoff commented Jul 3, 2023

View reviewed changes

.golangci.yml Outdated Show resolved Hide resolved

ademidoff commented Jul 3, 2023

View reviewed changes

ademidoff force-pushed the PMM-11658-move-exporter-configs-elsewhere branch 8 times, most recently from 96c146c to 4077ece Compare July 7, 2023 14:45

ademidoff added the ready for review label Jul 7, 2023

github-actions bot reviewed Jul 7, 2023

View reviewed changes

agent/config/config_test.go Outdated Show resolved Hide resolved

Alex Tymchuk added 5 commits July 7, 2023 15:34

PMM-11658 move TempDir inside the main dist tree

5098533

PMM-11658 add panic on error for tmp creation

0e625b6

PMM-11658 panic using the logger

b6fabce

PMM-11658 refactor old APIs

0a64207

PMM_11658 change the message wording

PMM-11658 throw away redundant installs

8c29dba

ademidoff force-pushed the PMM-11658-move-exporter-configs-elsewhere branch from 4ff6003 to c055c8f Compare July 7, 2023 15:34

Alex Tymchuk added 7 commits July 7, 2023 15:36

PMM-11658 cleanup the tmp directory an agent shutdown

acd2fa5

PMM-11658 remove a debug statement PMM-11658 format the code PMM-11658 fix a linter error

PMM-11658 clean TmpDir on agent stop event

940c90c

PMM-11658 fix the tmp path in tests

a02e5db

PMM-11658 fix timing in TmpDir path assignment and creation

55a892c

PMM-11658 refactor TempDir assignment logic

394f3eb

PMM-11658 skip the failing test PMM-11658 print some debug info

PMM-11658 set a nicer user prompt for docker

6a10aa5

PMM-11658 print more debug info

PMM-11658 refactor TmpDir to be relative of cwd

cb1e59b

PMM-11658 format the code

ademidoff requested review from idoqo and JiriCtvrtka July 7, 2023 15:40

ademidoff mentioned this pull request Jul 7, 2023

PMM-11658 move exporter configs out of /tmp Percona-Lab/pmm-submodules#3336

Closed

ademidoff removed the ready for review label Jul 7, 2023

BupycHuk requested changes Jul 7, 2023

View reviewed changes

Alex Tymchuk added 3 commits July 7, 2023 21:53

PMM-11658 use t.Cleanup vs defer

da7013b

PMM-11658 adress review comments

e2f1be2

PMM-11658 make TempDir relative to BasePath, fix tests

141cfad

ademidoff requested a review from BupycHuk July 9, 2023 23:56

ademidoff commented Jul 10, 2023

View reviewed changes

PMM-11658 minor corrections

3e9cf4f

JiriCtvrtka reviewed Jul 10, 2023

View reviewed changes

agent/agents/supervisor/supervisor.go Show resolved Hide resolved

PMM-11658 fix the prompt

8bfca5d

BupycHuk approved these changes Jul 10, 2023

View reviewed changes

agent/config/config.go Outdated Show resolved Hide resolved

agent/config/config.go Outdated Show resolved Hide resolved

JiriCtvrtka approved these changes Jul 10, 2023

View reviewed changes

artemgavrilov reviewed Jul 10, 2023

View reviewed changes

.golangci.yml Outdated Show resolved Hide resolved

agent/config/config.go Outdated Show resolved Hide resolved

Alex Tymchuk added 2 commits July 10, 2023 12:20

PMM-11658 revert .golangci.yml

f53b363

PMM-11658 remove redundant TmpDir creation

1985d6b

ademidoff force-pushed the PMM-11658-move-exporter-configs-elsewhere branch from 7aebdd3 to 1985d6b Compare July 10, 2023 13:05

Merge branch 'main' into PMM-11658-move-exporter-configs-elsewhere

670e60c

BupycHuk approved these changes Jul 10, 2023

View reviewed changes

ademidoff requested a review from artemgavrilov July 10, 2023 13:30

artemgavrilov approved these changes Jul 10, 2023

View reviewed changes

PMM-11658 fix the lint error

29a13ce

ademidoff mentioned this pull request Jul 17, 2023

PMM-11658 move exporter configs elsewhere Percona-Lab/jenkins-pipelines#2213

Merged

ademidoff enabled auto-merge (squash) July 24, 2023 14:02

Alex Tymchuk added 2 commits July 24, 2023 17:02

Merge branch 'main' into PMM-11658-move-exporter-configs-elsewhere

b411730

Merge branch 'main' into PMM-11658-move-exporter-configs-elsewhere

bf45cfa

ademidoff merged commit 46ecd31 into main Jul 24, 2023
31 checks passed

ademidoff deleted the PMM-11658-move-exporter-configs-elsewhere branch July 24, 2023 16:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PMM-11658 move the exporter configs away from /tmp #2341

PMM-11658 move the exporter configs away from /tmp #2341

ademidoff commented Jul 3, 2023 •

edited

Loading

ademidoff Jul 3, 2023

codecov bot commented Jul 3, 2023 •

edited

Loading

ademidoff Jul 3, 2023

ademidoff Jul 3, 2023 •

edited

Loading

ademidoff Jul 3, 2023

ademidoff Jul 10, 2023 •

edited

Loading

BupycHuk left a comment

PMM-11658 move the exporter configs away from /tmp #2341

PMM-11658 move the exporter configs away from /tmp #2341

Conversation

ademidoff commented Jul 3, 2023 • edited Loading

ademidoff Jul 3, 2023

Choose a reason for hiding this comment

codecov bot commented Jul 3, 2023 • edited Loading

Codecov Report

ademidoff Jul 3, 2023

Choose a reason for hiding this comment

ademidoff Jul 3, 2023 • edited Loading

Choose a reason for hiding this comment

ademidoff Jul 3, 2023

Choose a reason for hiding this comment

ademidoff Jul 10, 2023 • edited Loading

Choose a reason for hiding this comment

BupycHuk left a comment

Choose a reason for hiding this comment

ademidoff commented Jul 3, 2023 •

edited

Loading

codecov bot commented Jul 3, 2023 •

edited

Loading

ademidoff Jul 3, 2023 •

edited

Loading

ademidoff Jul 10, 2023 •

edited

Loading