Skip to content

Commit

Permalink
Merge branch 'v3' into PMM-12985-api-infra-modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Sep 20, 2024
2 parents 3e2bf0c + 0734b92 commit 75eacc1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions build/packages/rpm/server/SPECS/pmm-dump.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

%global repo pmm-dump
%global provider github.com/percona/%{repo}
%global commit 0d49b27729506dc62950f9fa59147d63df194db2
%global commit f226dbb3afb62ac4b9b39032935b5694a48d526f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define build_timestamp %(date -u +"%y%m%d%H%M")
%define release 1
%define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist}

Name: pmm-dump
Version: 0.7.0
Version: 3.0.0
Release: %{rpm_release}
Summary: Percona PMM Dump allows to export and import monitoring metrics and query analytics.

Expand Down Expand Up @@ -37,6 +37,9 @@ install -p -m 0755 pmm-dump %{buildroot}%{_sbindir}/pmm-dump


%changelog
* Thu Aug 8 2024 Alex Demidoff <[email protected]> - 3.0.0-1
- PMM-13282 Migrate pmm-dump to v3 API

* Tue Nov 23 2023 Artem Gavrilov <[email protected]> - 0.7.0-ga
- PMM-12460 Update pmm-dump to v0.7.0-ga version

Expand Down
2 changes: 1 addition & 1 deletion managed/services/dump/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func (s *Service) StartDump(params *Params) (string, error) {
pmmDumpCmd := exec.CommandContext(ctx, //nolint:gosec
pmmDumpBin,
"export",
"--pmm-url=http://127.0.0.1",
"--pmm-url=http://127.0.0.1:8080",
fmt.Sprintf("--dump-path=%s", getDumpFilePath(dump.ID)))

if params.APIKey != "" {
Expand Down

0 comments on commit 75eacc1

Please sign in to comment.