timeline and gui improvements

matjaz99 · Jul 2, 2023 · ae167e1 · ae167e1
1 parent 81b2000
commit ae167e1
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,13 @@
 ## 2.4.5-SNAPSHOT
 
 * [CHANGE] Moved all configuration parameters from configuration view to providers
-* [FEATURE] Journal Timeline
+* [FEATURE] Journal Timeline in instance view
 * [ENHANCEMENT] Added link to active alerts directly from providers
+* [ENHANCEMENT] Show targets count in targets view
 * [ENHANCEMENT] Added POJO support in MongoDB client
 * [ENHANCEMENT] Added configuration option for `ALERTMONITOR_MONGODB_CONNECT_TIMEOUT_SEC` and `ALERTMONITOR_MONGODB_READ_TIMEOUT_SEC`
 * [ENHANCEMENT] Added `provider` attribute to alerts
+* [ENHANCEMENT] Added provider file path to config view
 
 ## 2.4.4-SNAPSHOT
 

diff --git a/src/main/java/si/matjazcerkvenik/alertmonitor/data/MongoDbDataManager.java b/src/main/java/si/matjazcerkvenik/alertmonitor/data/MongoDbDataManager.java
@@ -158,7 +158,7 @@ public List<DEvent> getJournal() {
 
             List<DEvent> docsResultList = collection.find()
                     .sort(Sorts.descending("timestamp"))
-                    .limit(1000)
+                    .limit(5000)
                     .into(new ArrayList<>());
 
             logger.info("MongoDbDataManager: docsResultList size=" + docsResultList.size());

diff --git a/src/main/java/si/matjazcerkvenik/alertmonitor/web/uibeans/UiConfigBean.java b/src/main/java/si/matjazcerkvenik/alertmonitor/web/uibeans/UiConfigBean.java
@@ -104,6 +104,10 @@ public String getRuntimeId() {
         return AmProps.RUNTIME_ID;
     }
 
+    public String getProvidersFilePath() {
+        return AmProps.ALERTMONITOR_DATAPROVIDERS_CONFIG_FILE;
+    }
+
 
 
 

diff --git a/src/main/java/si/matjazcerkvenik/alertmonitor/web/uibeans/UiInstanceBean.java b/src/main/java/si/matjazcerkvenik/alertmonitor/web/uibeans/UiInstanceBean.java
@@ -162,7 +162,7 @@ public String getUpStatusTooltip() {
                         .endDate(end)
                         .editable(true)
                         .group(e.getAlertname())
-                        .styleClass("sdfg".toLowerCase())
+                        .styleClass(e.getSeverity().toLowerCase())
                         .build();
 
                 model.add(event);

diff --git a/src/main/webapp/WEB-INF/taglib/target.xhtml b/src/main/webapp/WEB-INF/taglib/target.xhtml
@@ -14,6 +14,8 @@
                             <h:link value="#{target.hostname}" outcome="/targets/instance">
                                 <f:param name="target" value="#{target.id}" />
                             </h:link>
+                            <h:outputText value="UP" rendered="#{target.up}" style="margin-left: 20px; color: green; font-weight: bold" />
+                            <h:outputText value="DOWN" rendered="#{!target.up}" style="margin-left: 20px; color: red; font-weight: bold" />
                         </span>
                     </div>
                 </div>

diff --git a/src/main/webapp/config/config.xhtml b/src/main/webapp/config/config.xhtml
@@ -55,6 +55,9 @@
 						<f:selectItem itemLabel="TRACE" itemValue="TRACE"/>
 					</p:selectOneMenu>
 
+					<p:outputLabel value="Providers file path: " class="boldtext"/>
+					<p:outputLabel value="#{uiConfigBean.providersFilePath}" />
+
 					<p:outputLabel value="Data retention (days): " class="boldtext">
 						<i class="pi pi-pencil" style="font-size: 0.5 rem"></i>
 					</p:outputLabel>

diff --git a/src/main/webapp/resources/css/am_styles.css b/src/main/webapp/resources/css/am_styles.css
@@ -120,8 +120,8 @@ body .ui-datatable .ui-datatable-data tr td {
     border-radius: 4px;
     margin-bottom: 1.1rem;
 }
-/* override .card style */
-.target-true {
+/* override .card style in targets. add to <div class="card target-#{target.up}"> */
+/*.target-true {
     background: #89FF61 !important;
     border: 1px solid #2C7B00 !important;
     box-shadow: 0 2px 1px -1px rgba(0, 255, 0, 0.2), 0 1px 1px 0 rgba(0, 255, 0, 0.14), 0 1px 3px 0 rgba(0, 255, 0, 0.12) !important;
@@ -130,4 +130,7 @@ body .ui-datatable .ui-datatable-data tr td {
     background: #FF7474 !important;
     border: 1px solid #750000 !important;
     box-shadow: 0 2px 1px -1px rgba(255, 0, 0, 0.2), 0 1px 1px 0 rgba(255, 0, 0, 0.14), 0 1px 3px 0 rgba(255, 0, 0, 0.12) !important;
-}
+}*/
+
+
+
diff --git a/src/main/webapp/targets/instance.xhtml b/src/main/webapp/targets/instance.xhtml
@@ -20,7 +20,7 @@
 
 				<h:form>
 					<p:accordionPanel dynamic="true" cache="true">
-						<p:tab title="Active alerts">
+						<p:tab title="Active alerts (#{uiInstanceBean.instanceActiveAlarms.size()})">
 							<p:dataTable id="tAlertsTable" widgetVar="notifsTable"
 										 value="#{uiInstanceBean.instanceActiveAlarms}" var="a"
 										 rowStyleClass="#{a.severity}"
@@ -112,27 +112,21 @@
 
 							</p:dataTable>
 						</p:tab>
-						<p:tab title="Timeline">
-							<div class="card">
-								<p:timeline id="timeline" value="#{uiInstanceBean.model}"
-											editable="false" eventMargin="10" eventMarginAxis="0"
-											start="#{uiInstanceBean.start}" end="#{uiInstanceBean.end}"
-											stackEvents="false" widgetVar="timelineWdgt">
-									<f:facet name="menu">
-										<p:commandButton type="button" icon="pi pi-chevron-left" styleClass="ml-2" onclick="PF('timelineWdgt').move(-0.3);" />
-										<p:commandButton type="button" icon="pi pi-chevron-right" styleClass="ml-2" onclick="PF('timelineWdgt').move(0.3);" />
-										<p:commandButton type="button" icon="pi pi-search-minus" styleClass="ml-2" onclick="PF('timelineWdgt').zoom(-0.5);" />
-										<p:commandButton type="button" icon="pi pi-search-plus" styleClass="ml-2" onclick="PF('timelineWdgt').zoom(0.5);" />
-									</f:facet>
-
-									<f:facet name="loading">
-										<h2>Loading timeline...</h2>
-									</f:facet>
-								</p:timeline>
-							</div>
-						</p:tab>
 					</p:accordionPanel>
 
+					<br/>
+
+					<div class="card">
+						<p:timeline id="timeline" value="#{uiInstanceBean.model}"
+									editable="false" eventMargin="10" eventMarginAxis="0"
+									start="#{uiInstanceBean.start}" end="#{uiInstanceBean.end}"
+									stackEvents="false" widgetVar="timelineWdgt">
+
+							<f:facet name="loading">
+								<h2>Loading timeline...</h2>
+							</f:facet>
+						</p:timeline>
+					</div>
 
 				</h:form>
 

diff --git a/src/main/webapp/targets/targets.xhtml b/src/main/webapp/targets/targets.xhtml
@@ -17,6 +17,8 @@
 					<p:ajax listener="#{uiBean.getTargets}" update="targetsForm"/>
 				</p:toggleSwitch>
 				<br/>
+				<p:outputLabel value="Size: #{uiBean.targets.size()}"/>
+				<br/>
 				<p:tag id="resultStatus" styleClass="p-mr-2" severity="danger" value="#{uiBean.result}" rendered="#{uiBean.result != null}"></p:tag>
 
 				<p:dataView var="target"