Commit cec2084b authored by intrigeri's avatar intrigeri
Browse files

Monitoring doc: various rephrasing, navigation improvements & typo fixes.

refs: #11366
parent 96c9ecd4
......@@ -178,6 +178,8 @@ We use Redmine tickets for public discussion and tasks management:
- `tails::git_annex::mirror` defined resource in
[[!tails_gitweb_repo puppet-tails]]
<a id="icinga2"></a>
## Icinga2
* purpose: Monitor Tails online services and systems.
......@@ -192,7 +194,7 @@ We use Redmine tickets for public discussion and tasks management:
where the master or the satellite have no right to configure agents or
run arbitrary commands on them.
* tools: [[!debpts icinga2 desc="Icinga2"]], [[!debpts icingaweb2]]
* configurations
* configuration:
- master:
* `tails::monitoring::master` class in [[!tails_gitweb_repo puppet-tails]].
* some configuration in the ecours.tails.boum.org node manifest.
......@@ -205,8 +207,8 @@ We use Redmine tickets for public discussion and tasks management:
* `tails::monitoring::satellite` class in [[!tails_gitweb_repo puppet-tails]],
- agents:
* `tails::monitoring::agent` class in [[!tails_gitweb_repo puppet-tails]]
* Informations about how to add checks to our monitoring setup can be
found in [[this how-to|roles/sysadmins/adding_icinga2_checks]].
* documentation:
- [[How to add checks to our monitoring setup|roles/sysadmins/adding_icinga2_checks]]
## Jenkins
......
[[!meta title="Adding Icinga2 checks in the Tails infrastructure"]]
[[!meta title="How to add Icinga2 checks in the Tails infrastructure"]]
See [[our sysadmin contribution page|contribute/working_together/roles/sysadmins]]
for a description of our Icinga2 setup.
First, see the
[[description of our Icinga2 setup|contribute/working_together/roles/sysadmins#icinga2]].
The [upstream Icinga2 Puppet
module](https://git.icinga.org/?p=icinga2.git), which may help in
simplifying our Puppet manifest, requires to use the puppetdb backend to
support its complex exported resources. In Debian Jessie, exported
resources are only supported through the Active Record backend, so we
resources are only supported through the Active Records backend, so we
can't use this Puppet module right now. Until PuppetDB can be
used (possibly in Stretch), we have to write more Puppet code to add
new checks.
......@@ -69,9 +69,8 @@ In this case, the exported resources for this kind of service checks
need to be collected on the master, satellite and concerned system(s).
That's what we do in the `tails::monitoring::{master,satellite,agent}`
classes for the `tails::monitoring::service::memory` check in
[[!tails_gitweb_repo puppet-tails]]. Pay attention to the parameter
passed at the exported resources collection: the `$nodename` and
`$tag` parameter must be set.
[[!tails_gitweb_repo puppet-tails]]. Make sure that the `$nodename` and
`$tag` parameters are set when collecting such exported resources.
# Deploy
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment