Side by Side Diff: README.md
Issue 5712550654115840:
#765 - Update "Monitoring" section in README.md (Closed)
Patch Set: #765 - Update "Monitoring" section in README.md (incl. markup fix)
Created July 10, 2014, 10:36 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 Adblock Plus infrastructure | 1 Adblock Plus infrastructure |
| 2 =========================== | 2 =========================== |
| 3 | 3 |
| 4 The Adblock Plus infrastructure uses [Puppet](http://puppetlabs.com/) | 4 The Adblock Plus infrastructure uses [Puppet](http://puppetlabs.com/) |
| 5 to set up servers, and to have a realistic development environment. | 5 to set up servers, and to have a realistic development environment. |
| 6 | 6 |
| 7 Our Puppet manifests are only tested with Ubuntu 12.04 right now. | 7 Our Puppet manifests are only tested with Ubuntu 12.04 right now. |
| 8 | 8 |
| 9 Private files | 9 Private files |
| 10 ------------- | 10 ------------- |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 | 158 |
| 159 Here _serveradmin_ is your user account on the servers, it will be used to | 159 Here _serveradmin_ is your user account on the servers, it will be used to |
| 160 run Puppet on the servers via SSH (sudo privilege required). You can list any | 160 run Puppet on the servers via SSH (sudo privilege required). You can list any |
| 161 host groups defined in _manifests/monitoringserver.pp_ or individual servers. | 161 host groups defined in _manifests/monitoringserver.pp_ or individual servers. |
| 162 You can also use _-v_ flag to see verbose Puppet output or _-t_ flag to do a | 162 You can also use _-v_ flag to see verbose Puppet output or _-t_ flag to do a |
| 163 dry run without changing anything. | 163 dry run without changing anything. |
| 164 | 164 |
| 165 Monitoring | 165 Monitoring |
| 166 ---------- | 166 ---------- |
| 167 | 167 |
| 168 Monitoring is fully functional in the development environment: | 168 Monitoring is fully functional in any environment, including development. |
| 169 [https://10.8.0.98/](https://10.8.0.98/) | 169 Here, after bootstrapping the `server4` box, one can access the Nagios GUI |
| 170 from the host machine via <https://nagiosadmin:nagiosadmin@10.8.0.99/> -- | |
|
Wladimir Palant
2014/07/10 11:00:31
Looks good but why -- rather than period?
mathias
2014/07/10 13:38:10
Just because some UI guy once told me that it's no
Wladimir Palant
2014/07/10 13:51:05
That shouldn't be a concern for a linkified URL. Y
| |
| 170 | 171 |
| 171 User name and password are both _nagiosadmin_. | 172 The monitoring service of our production environment, however, is accessible |
| 173 via <https://monitoring.adblockplus.org/>. | |
| 174 Add yourself to _files/nagios-htpasswd_ in the _private_ module used on the | |
| 175 server, or have someone add you if you don't have access. | |
| 172 | 176 |
| 173 The monitoring service of our production environment runs on | 177 |
| 174 _monitoring.adblockplus.org_. Add yourself to _files/nagios-htpasswd_ | |
| 175 in the _private_ module used on the server, or have someone add you if | |
| 176 you don't have access. | |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
