Skip to content

Commit

Permalink
Merge branch 'main' into PMM-7-fix-pg-connection-issue-in-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Tymchuk authored Sep 6, 2023
2 parents c1243d0 + eea5256 commit aa2f526
Show file tree
Hide file tree
Showing 37 changed files with 387 additions and 779 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
echo "GOROOT=$HOME/gotip" >> $GITHUB_ENV
echo "$HOME/gotip/bin" >> $GITHUB_PATH
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
lfs: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: API
uses: readmeio/rdme@v8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
environment: Production
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Update Docker Hub Readme for perconalab/pmm-server
uses: peter-evans/dockerhub-description@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/managed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Enable Go build cache
if: ${{ fromJSON(env.DEVCONTAINER_CACHE_ENABLED) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qan-api2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sbom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create SBOM for PMM
uses: anchore/sbom-action@v0
Expand All @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create SBOM for vmproxy
uses: anchore/sbom-action@v0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Docker Up
run: docker compose up -d
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vmproxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
Expand Down
184 changes: 92 additions & 92 deletions api/managementpb/checks.pb.go

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions api/managementpb/checks.proto
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,15 @@ service SecurityChecks {
}
// ToggleCheckAlert allows to switch alerts state for a check result between "silenced" and "unsilenced".
rpc ToggleCheckAlert(ToggleCheckAlertRequest) returns (ToggleCheckAlertResponse) {
option deprecated = true;
option (google.api.http) = {
post: "/v1/management/SecurityChecks/ToggleCheckAlert"
body: "*"
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "Toggle Check Alert"
description: "Silence/Unsilence alerts for a specific check result."
deprecated: true
};
}
// GetSecurityCheckResults returns Security Thread Tool's latest checks results.
Expand All @@ -223,6 +225,7 @@ service SecurityChecks {
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
summary: "Get Security Check Results"
description: "Returns Security Thread Tool's latest checks results."
deprecated: true
};
}
// StartSecurityChecks executes Security Thread Tool checks and returns when all checks are executed.
Expand Down
3 changes: 3 additions & 0 deletions api/managementpb/checks_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions api/managementpb/json/managementpb.json
Original file line number Diff line number Diff line change
Expand Up @@ -6365,6 +6365,7 @@
],
"summary": "Get Security Check Results",
"operationId": "GetSecurityCheckResults",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down Expand Up @@ -6788,6 +6789,7 @@
],
"summary": "Toggle Check Alert",
"operationId": "ToggleCheckAlert",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down
2 changes: 2 additions & 0 deletions api/swagger/swagger-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -29902,6 +29902,7 @@
],
"summary": "Get Security Check Results",
"operationId": "GetSecurityCheckResults",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down Expand Up @@ -30325,6 +30326,7 @@
],
"summary": "Toggle Check Alert",
"operationId": "ToggleCheckAlert",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down
2 changes: 2 additions & 0 deletions api/swagger/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -20529,6 +20529,7 @@
],
"summary": "Get Security Check Results",
"operationId": "GetSecurityCheckResults",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down Expand Up @@ -20952,6 +20953,7 @@
],
"summary": "Toggle Check Alert",
"operationId": "ToggleCheckAlert",
"deprecated": true,
"parameters": [
{
"name": "body",
Expand Down
4 changes: 2 additions & 2 deletions build/packages/rpm/server/SPECS/victoriametrics.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

Name: percona-victoriametrics
Version: 1.93.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: VictoriaMetrics monitoring solution and time series database
License: Apache-2.0
URL: https://%{provider}
Expand Down Expand Up @@ -50,7 +50,7 @@ install -D -p -m 0755 ./bin/vmalert-pure %{buildroot}%{_sbindir}/vmalert


%changelog
* Tue Dec 15 2020 Nurlan Moldomurov <[email protected]> - 1.93.1-1
* Fri Sep 1 2023 Nurlan Moldomurov <[email protected]> - 1.93.1-2
- upgrade victoriametrics to 1.93.1 release

* Wed Mar 29 2023 Alexey Mukas <[email protected]> - 1.89.1
Expand Down
Loading

0 comments on commit aa2f526

Please sign in to comment.