added license

CHANGELOG.md

@@ -1,8 +1,13 @@
+## 2.0.0-SNAPSHOT
+
+* [CHANGE] There are so many improvements in this release, the version is upgraded to 2.
+* [CHANGE] Licensed under Apache-2.0 License
+
 ## 1.6.3-SNAPSHOT
 
 * [CHANGE] Webhook view link removed from toolbar
 * [FEATURE] Smart targets. The concept of smart targets is not new as Alertmonitor already did it in Targets view. It's just 
-that Targets are now retrieved from Prometheus. And you can now switch between views: instance or smartTarget.
+that Targets are now retrieved from Prometheus. And you can now switch between: instance or smartTarget view.
 * [FEATURE] Reload Prometheus config button
 * [FEATURE] Load alert rules and show them in alerts
 * [ENHANCEMENT] Added metric `alertmonitor_prom_api_duration_seconds` for monitoring Prometheus API response time. 

Dockerfile

@@ -6,6 +6,9 @@ RUN apk add tzdata
 COPY target/alertmonitor.war /usr/local/tomcat/webapps/alertmonitor.war
 
 RUN mkdir -p /opt/alertmonitor/log
+COPY LICENSE /opt/alertmonitor
+COPY NOTICE /opt/alertmonitor
+COPY README.md /opt/alertmonitor
 
 #HEALTHCHECK --interval=5m --timeout=3s \
 #  CMD curl -f http://localhost:8080/alertmonitor || exit 1

NOTICE

@@ -0,0 +1,21 @@
+The Alertmonitor system
+Copyright 2021 Matjaž Cerkvenik
+
+This product includes software developed by Matjaž Cerkvenik.
+
+The following components are included in this product:
+
+javax.servlet-api
+javax.annotation-api
+jsf-api
+jsf-impl
+primefaces
+gson
+simpleclient
+simpleclient_common
+simple-logger
+okhttp
+okio
+kafka-clients
+
+The Alertmonitor docker image is based on: tomcat:8.5-jre8-alpine

README.md

@@ -9,25 +9,28 @@
 Alertmonitor is a webapp for displaying alerts from Prometheus. It offers a nice GUI with lots of cool features for browsing, 
 sorting and filtering alerts.
 
-Alerts are pushed from Alertmanager to the HTTP endpoint of Alertmonitor: `/alertmonitor/webhook`. 
-If pushing alerts from Alertmanager is not configured, you can pull alerts via /alerts endpoint.
+Alertmonitor is receiving alerts from Alertmanager on the HTTP endpoint: `/alertmonitor/webhook`. 
+Alternatively, if webhook receiver is not configured, Alertmonitor can still pull alerts directly from Prometheus. 
+Ideally both approaches can be used in combination. This way you'll always receive alert immediately when it is fired and yet it offers 
+possibility to *synchronize* alerts with Prometheus current state in case if any alert has been lost.
+
+
+Alertmonitor offers the following views:
+- Active alerts - all currently firing alerts
+- Journal - history of alerts
+- Targets - alerts sorted by targets or instances
+- Statistics - some statistical data (there is also `/metrics` endpoint)
+- Configuration - configuration parameters of Alertmonitor
+- About - general information
 
-Alertmonitor provides the following views:
-- Journal - history of all events
-- Active - only active alerts
-- Targets - alerts sorted by targets
-- Statistics - statistical data
-- About - general information and configuration options
 
 Alertmonitor correlates firing alerts and resolving alerts to display current state of active alarms.
 
 Alerts can be filtered by tags.
 
-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.
-
+Screenshot:
 
-![Alertmonitor](docs/overview.png)
+![Alertmonitor](docs/screenshots/2.0.0/alerts.png)
 
 
 ## Quick start

src/main/java/si/matjazcerkvenik/alertmonitor/model/DAO.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 import si.matjazcerkvenik.alertmonitor.model.prometheus.PRule;

src/main/java/si/matjazcerkvenik/alertmonitor/model/DNotification.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 import si.matjazcerkvenik.alertmonitor.util.MD5;

src/main/java/si/matjazcerkvenik/alertmonitor/model/DTag.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 public class DTag {

src/main/java/si/matjazcerkvenik/alertmonitor/model/PSyncTask.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 import si.matjazcerkvenik.alertmonitor.model.alertmanager.*;

src/main/java/si/matjazcerkvenik/alertmonitor/model/Severity.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 public class Severity {

src/main/java/si/matjazcerkvenik/alertmonitor/model/TagColors.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 import java.util.Random;

src/main/java/si/matjazcerkvenik/alertmonitor/model/Target.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 import java.util.ArrayList;

src/main/java/si/matjazcerkvenik/alertmonitor/model/TaskManager.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model;
 
 import si.matjazcerkvenik.alertmonitor.util.AmMetrics;

src/main/java/si/matjazcerkvenik/alertmonitor/model/alertmanager/AlertmanagerProcessor.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.alertmanager;
 
 import com.google.gson.Gson;
@@ -13,7 +28,7 @@
 
 public class AlertmanagerProcessor {
 
-    public static void processWebhookMessage(WebhookMessage m) {
+    public static void processWebhookMessage(WebhookMessage m) throws Exception {
 
         GsonBuilder builder = new GsonBuilder();
         Gson gson = builder.create();

src/main/java/si/matjazcerkvenik/alertmonitor/model/alertmanager/AmAlert.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.alertmanager;
 
 import java.util.Map;

src/main/java/si/matjazcerkvenik/alertmonitor/model/alertmanager/AmAlertMessage.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.alertmanager;
 
 import si.matjazcerkvenik.alertmonitor.model.alertmanager.AmAlert;

src/main/java/si/matjazcerkvenik/alertmonitor/model/prometheus/PAlert.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.prometheus;
 
 import java.util.Map;

src/main/java/si/matjazcerkvenik/alertmonitor/model/prometheus/PAlertsData.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.prometheus;
 
 import java.util.List;

src/main/java/si/matjazcerkvenik/alertmonitor/model/prometheus/PAlertsMessage.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.prometheus;
 
 public class PAlertsMessage {

src/main/java/si/matjazcerkvenik/alertmonitor/model/prometheus/PRule.java

@@ -1,3 +1,18 @@
+/*
+   Copyright 2021 Matjaž Cerkvenik
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ */
 package si.matjazcerkvenik.alertmonitor.model.prometheus;
 
 import java.util.Map;