Skip to content

Commit 8b7054d

Browse files
jkatzjmckulk
andauthored
Update installer to pull container alert rules
The alert rules now reside in a file in pgMonitor. This change reflects that change and updates the version of pgMonitor required. Co-authored-by: Joseph Mckulka <[email protected]>
1 parent aa8a6f2 commit 8b7054d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

bin/get-pgmonitor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515

1616
echo "Getting pgMonitor..."
17-
PGMONITOR_COMMIT='v4.4-RC4'
17+
PGMONITOR_COMMIT='v4.4-RC5'
1818

1919
# pgMonitor Setup
2020
if [[ -d ${PGOROOT?}/tools/pgmonitor ]]

installers/metrics/ansible/roles/pgo-metrics/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ delete_metrics_namespace: "false"
99
metrics_namespace: "pgo"
1010
metrics_image_pull_secret: ""
1111
metrics_image_pull_secret_manifest: ""
12-
pgmonitor_version: "v4.4-RC4"
12+
pgmonitor_version: "v4.4-RC5"
1313

1414
alertmanager_configmap: "alertmanager-config"
1515
alertmanager_rules_configmap: "alertmanager-rules-config"

installers/metrics/ansible/roles/pgo-metrics/tasks/alertmanager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
command: "cp {{ pgmonitor_prometheus_dir }}/{{ item.src }} {{ alertmanager_output_dir }}/{{ item.dst }}"
2323
loop:
2424
- { src: 'crunchy-alertmanager.yml', dst: 'alertmanager.yml'}
25-
- { src: 'alert-rules.d/crunchy-alert-rules-pg.yml.example', dst: 'crunchy-alert-rules-pg.yml'}
25+
- { src: 'alert-rules.d/crunchy-alert-rules-pg.yml.containers.example', dst: 'crunchy-alert-rules-pg.yml'}
2626

2727
- name: Create Alertmanager Config ConfigMap
2828
shell: |
@@ -98,4 +98,4 @@
9898
register: create_alertmanager_deployment_result
9999
failed_when:
100100
- create_alertmanager_deployment_result.rc != 0
101-
- "'AlreadyExists' not in create_alertmanager_deployment_result.stderr"
101+
- "'AlreadyExists' not in create_alertmanager_deployment_result.stderr"

0 commit comments

Comments
 (0)