Skip to content

Commit

Permalink
Adjust docs for 2.10.x from cherry-picked commits
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Friedrich committed May 21, 2019
1 parent 7e70bb2 commit 017cd81
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions doc/12-icinga2-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ consider passing them in the request body. For GET requests, this method is expl
[here](12-icinga2-api.md#icinga2-api-requests-method-override).

You can use [jo](https://github.com/jpmens/jo) to format JSON strings on the shell. An example
for API actions shown [here](#icinga2-api-actions-unix-timestamps).
for API actions shown [here](12-icinga2-api.md#icinga2-api-actions-unix-timestamps).


### Global Parameters <a id="icinga2-api-parameters-global"></a>
Expand Down Expand Up @@ -2247,11 +2247,11 @@ and developers have been working hard to add more REST API
clients and integrations into DevOps tools.

* [Libraries](12-icinga2-api.md#icinga2-api-clients-libraries)
* [Status](#icinga2-api-clients-status)
* [Management](#icinga2-api-clients-management)
* [Event Streams](#icinga2-api-clients-event-streams)
* [Actions](#icinga2-api-clients-actions)
* [REST API Apps](#icinga2-api-clients-apps)
* [Status](12-icinga2-api.md#icinga2-api-clients-status)
* [Management](12-icinga2-api.md#icinga2-api-clients-management)
* [Event Streams](12-icinga2-api.md#icinga2-api-clients-event-streams)
* [Actions](12-icinga2-api.md#icinga2-api-clients-actions)
* [REST API Apps](12-icinga2-api.md#icinga2-api-clients-apps)

Additional [programmatic examples](12-icinga2-api.md#icinga2-api-clients-programmatic-examples)
will help you getting started using the Icinga 2 API in your environment.
Expand Down
12 changes: 6 additions & 6 deletions doc/19-technical-concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -594,27 +594,27 @@ support HA awareness, provide the `enable_ha` configuration attribute. When `ena
is set to `true` (usually the default), "Run-Once" is set and the feature pauses on one side.

```
vim /etc/icinga2/features-enabled/graphite.conf
vim /etc/icinga2/features-enabled/ido-mysql.conf
object GraphiteWriter "graphite" {
object IdoMysqlConnection "ido-mysql" {
...
enable_ha = true
}
```

Once such a feature is paused, there won't be any more event handling, e.g. the Elasticsearch
feature won't process any checkresults nor write to the Elasticsearch REST API.
Once such a feature is paused, there won't be any more event handling, e.g. the IDO MySQL
feature won't write status and config updates anymore for this endpoint.

When the cluster connection drops, the feature configuration object is updated with
the new object authority by the ApiListener timer and resumes its operation. You can see
that by grepping the log file for `resumed` and `paused`.

```
[2018-10-24 13:28:28 +0200] information/GraphiteWriter: 'g-ha' paused.
[2018-10-24 13:28:28 +0200] information/IdoMysqlConnection: 'ido-mysql' paused.
```

```
[2018-10-24 13:28:28 +0200] information/GraphiteWriter: 'g-ha' resumed.
[2018-10-24 13:28:28 +0200] information/IdoMysqlConnection: 'ido-mysql' resumed.
```

Specific features with HA capabilities are explained below.
Expand Down

0 comments on commit 017cd81

Please sign in to comment.