Launchpad Mojo Specs

Merge ~cjwatson/launchpad-mojo-specs:codeimport-ps5-nagios into launchpad-mojo-specs:master

  1. Git
  2. lp:~cjwatson/launchpad-mojo-specs
  3. codeimport-ps5-nagios
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Merged at revision: 78bb232d4f4c9ad29f6268dc544a83f80a692ee1
Proposed branch: ~cjwatson/launchpad-mojo-specs:codeimport-ps5-nagios
Merge into: launchpad-mojo-specs:master
Diff against target: 34 lines (+6/-6)
2 files modified
lp-codeimport/configs/custom-secgroups-production.yaml (+5/-5)
lp-codeimport/services (+1/-1)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+404061@code.launchpad.net

Commit message

codeimport: Allow nagios.ps5.canonical.com rather than wekufe

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lp-codeimport/configs/custom-secgroups-production.yaml b/lp-codeimport/configs/custom-secgroups-production.yaml
2index 4547841..c86ebcf 100644
3--- a/lp-codeimport/configs/custom-secgroups-production.yaml
4+++ b/lp-codeimport/configs/custom-secgroups-production.yaml
5@@ -10,11 +10,11 @@ rules:
6 - {"protocol": "tcp", "family": "IPv4", "port": 9103, "cidr": "91.189.95.24/32"}
7 - {"protocol": "tcp", "family": "IPv4", "port": 9103, "cidr": "91.189.94.60/32"}
8 nagios-monitored:
9- # Allow monitoring from wekufe.
10- - {"protocol": "tcp", "family": "IPv4", "port": 22, "cidr": "91.189.90.46/32"}
11- - {"protocol": "tcp", "family": "IPv4", "port": 873, "cidr": "91.189.90.46/32"}
12- - {"protocol": "tcp", "family": "IPv4", "port": 5666, "cidr": "91.189.90.46/32"}
13- - {"protocol": "icmp", "family": "IPv4", "cidr": "91.189.90.46/32"}
14+ # Allow monitoring from nagios.ps5.canonical.com.
15+ - {"protocol": "tcp", "family": "IPv4", "port": 22, "cidr": "185.125.188.164/32"}
16+ - {"protocol": "tcp", "family": "IPv4", "port": 873, "cidr": "185.125.188.164/32"}
17+ - {"protocol": "tcp", "family": "IPv4", "port": 5666, "cidr": "185.125.188.164/32"}
18+ - {"protocol": "icmp", "family": "IPv4", "cidr": "185.125.188.164/32"}
19 rsync-logs:
20 # Allow carob to fetch logs.
21 - {"protocol": "tcp", "family": "IPv4", "port": 873, "cidr": "91.189.90.14/32"}
22diff --git a/lp-codeimport/services b/lp-codeimport/services
23index 3cf072e..4ebab93 100644
24--- a/lp-codeimport/services
25+++ b/lp-codeimport/services
26@@ -9,7 +9,7 @@
27 {%- set log_hosts_allow = "carob.canonical.com" %}
28 {%- set nagios_context = "lp-prodstack-codeimport" %}
29 {%- set nagios_hostgroups = "prodstack-lp" %}
30-{%- set nagios_master = "wekufe.canonical.com" %}
31+{%- set nagios_master = "nagios.ps5.canonical.com" %}
32 {%- set nagios_servicegroups = "prompt-critical" %}
33 {%- set oops_prefix = "PRODUCTION" %}
34 {%- set rabbitmq_host = "ackee.canonical.com:5672" %}

Subscribers

People subscribed via source and target branches