Skip to content

Commit

Permalink
1.6.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
matjaz99 committed Feb 28, 2021
1 parent 46ccff1 commit 445bc63
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
## 1.6.0 / 2021-02-25
## 1.6.0 / 2021-02-28

* [CHANGE] Target view shows also targets with no active alerts (targets with at least one record in journal).
* [CHANGE] `currentValue` moved to annotations (see bug below)
* [FEATURE] Periodic synchronization of active alerts
* [FEATURE] Periodic synchronisation of active alerts (#16)
* [FEATURE] About view with basic configuration options
* [FEATURE] Added PsyncTask for periodically checking active alerts
* [FEATURE] Added environment variables for configuration: `ALERTMONITOR_PSYNC_INTERVAL_SEC`, `ALERTMONITOR_PSYNC_ENDPOINT`, `ALERTMONITOR_DATE_FORMAT`
* [ENHANCEMENT] Added resync statistics
* [ENHANCEMENT] Added periodic sync statistics
* [ENHANCEMENT] Added metric `alertmonitor_psync_task_total` and `alertmonitor_psync_interval_seconds`
* [ENHANCEMENT] Show number of alerts in last hour in statistics
* [ENHANCEMENT] Instance view shows active alerts and journal
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Alertmonitor correlates firing alerts and resolving alerts to display current st

Alerts can be filtered by tags.

Alertmonitor supports periodic synchronization of active alerts with Prometheus. This feature is extremely useful after a broken connection
Alertmonitor supports periodic synchronisation of active alerts with Prometheus. This feature is extremely useful after a broken connection
to refresh the state of currently active alerts.


Expand Down Expand Up @@ -190,8 +190,8 @@ A list of supported environment variables:
| EnvVar | Default value | Description |
|------------------------------------|-------------------------|------------------- |
| ALERTMONITOR_JOURNAL_SIZE | 20000 | Maximum journal size (FIFO). |
| ALERTMONITOR_PSYNC_INTERVAL_SEC | 900 | Periodic synchronization interval in seconds |
| ALERTMONITOR_PSYNC_ENDPOINT | http://localhost/prometheus/api/v1/alerts | The URL of Prometheus API for querying alerts |
| ALERTMONITOR_PSYNC_INTERVAL_SEC | 900 | Periodic synchronisation interval in seconds |
| ALERTMONITOR_PSYNC_ENDPOINT | http://localhost/prometheus/api/v1/alerts | The URL of Prometheus API for active alerts |
| ALERTMONITOR_DATE_FORMAT | yyyy/MM/dd H:mm:ss | Date format for displaying in GUI |

#### Environment variable substitution
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.5-SNAPSHOT
1.6.0
2 changes: 1 addition & 1 deletion src/main/webapp/about/about.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<h:form id="configForm">

<p:outputLabel value="Periodic Sync endpoint: " style="font-weight: bold; font-size: 14px;"/>
<p:outputLabel value="Alert sync endpoint: " style="font-weight: bold; font-size: 14px;"/>
<p:inplace editor="true">
<p:inputText value="#{webhookBean.psyncEndpoint}" required="true" label="text"/>
</p:inplace>
Expand Down

0 comments on commit 445bc63

Please sign in to comment.