scottk/siembol
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/siembol.git synced 2025-11-02 11:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Siembol-monitoring: fix healthcheck for monitoring + metric names (#693)

Browse Source
This commit is contained in:
Celie Valentiny
2022-06-27 15:17:09 +01:00
committed by GitHub
parent 6111335983
commit bb9d34ecdf
28 changed files with 139 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alerting/alerting-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,7 +35,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

4
alerting/alerting-spark/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -23,7 +23,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>jackson-databind</artifactId>

4
alerting/alerting-storm/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

2
alerting/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<modules>
<module>alerting-core</module>

4
config-editor/config-editor-core/pom.xml
View File

@@ -9,13 +9,13 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>

18
config-editor/config-editor-rest/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencyManagement>
<dependencies>
@@ -56,7 +56,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -67,22 +67,22 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-services</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-sync</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -93,7 +93,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -104,7 +104,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -115,7 +115,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

14
config-editor/config-editor-services/pom.xml
View File

@@ -10,7 +10,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -41,32 +41,32 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

8
config-editor/config-editor-sync/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -20,17 +20,17 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>config-editor-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

2
config-editor/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<modules>
<module>config-editor-core</module>

4
deployment/siembol-monitoring/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencyManagement>
@@ -37,7 +37,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

12
deployment/siembol-monitoring/src/main/java/uk/co/gresearch/siembol/deployment/monitoring/heartbeat/HeartbeatConsumer.java
View File

@@ -42,25 +42,25 @@ public class HeartbeatConsumer {
HeartbeatConsumer(HeartbeatConsumerProperties properties, SiembolMetricsRegistrar metricsRegistrar,
KafkaStreamsFactory streamsFactory) {
consumerErrorCount = metricsRegistrar.registerCounter(SiembolMetrics.HEARTBEAT_CONSUMER_ERROR.name());
consumerMessageRead = metricsRegistrar.registerCounter(SiembolMetrics.HEARTBEAT_MESSAGES_READ.name());
consumerErrorCount = metricsRegistrar.registerCounter(SiembolMetrics.HEARTBEAT_CONSUMER_ERROR.getMetricName());
consumerMessageRead = metricsRegistrar.registerCounter(SiembolMetrics.HEARTBEAT_MESSAGES_READ.getMetricName());
if (properties.getEnabledServices() == null) {
throw new IllegalArgumentException("Missing enabled services for heartbeat consumer.");
}
if (properties.getEnabledServices().contains(ServiceType.PARSING_APP)) {
servicesMetrics.add(Pair.of(ServiceType.PARSING_APP,
metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_PARSING_MS.name())));
metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_PARSING_MS.getMetricName())));
}
if (properties.getEnabledServices().contains(ServiceType.ENRICHMENT)) {
servicesMetrics.add(Pair.of(ServiceType.ENRICHMENT,
metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_ENRICHING_MS.name())));
metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_ENRICHING_MS.getMetricName())));
}
if (properties.getEnabledServices().contains(ServiceType.RESPONSE)) {
servicesMetrics.add(Pair.of(ServiceType.RESPONSE,
metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_RESPONDING_MS.name())));
metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_RESPONDING_MS.getMetricName())));
}
totalLatencyGauge = metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_TOTAL_MS.name());
totalLatencyGauge = metricsRegistrar.registerGauge(SiembolMetrics.HEARTBEAT_LATENCY_TOTAL_MS.getMetricName());
streams = createStreams(streamsFactory, properties);
streams.start();
}

2
deployment/siembol-monitoring/src/main/java/uk/co/gresearch/siembol/deployment/monitoring/heartbeat/HeartbeatProducer.java
View File

@@ -91,6 +91,6 @@ public class HeartbeatProducer implements Closeable {
}
public Health checkHealth() {
return exception.get() == null ? Health.down().withException(exception.get()).build(): Health.up().build();
return exception.get() == null ? Health.up().build(): Health.down().withException(exception.get()).build();
}
}

63
deployment/siembol-monitoring/src/test/java/uk/co/gresearch/siembol/deployment/monitoring/heartbeat/HeartbeatConsumerTest.java
View File

@@ -10,6 +10,9 @@ import org.junit.Before;
import org.junit.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
import reactor.core.publisher.Mono;
import uk.co.gresearch.siembol.common.constants.ServiceType;
import uk.co.gresearch.siembol.common.metrics.SiembolMetrics;
import uk.co.gresearch.siembol.common.metrics.test.SiembolMetricsTestRegistrar;
@@ -18,6 +21,9 @@ import uk.co.gresearch.siembol.common.testing.TestingDriverKafkaStreamsFactory;
import java.time.Instant;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Objects;
import static org.mockito.Mockito.when;
public class HeartbeatConsumerTest {
private final String heartbeatMessageStr = """
@@ -83,14 +89,14 @@ public class HeartbeatConsumerTest {
Serdes.String().serializer());
testInputTopic.pipeInput(heartbeatMessageStr);
Assert.assertEquals(1,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_PARSING_MS.name()), 0);
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_PARSING_MS.getMetricName()), 0);
Assert.assertEquals(19,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_ENRICHING_MS.name()), 0);
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_ENRICHING_MS.getMetricName()), 0);
Assert.assertEquals(11,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_RESPONDING_MS.name()), 0);
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_RESPONDING_MS.getMetricName()), 0);
Assert.assertEquals(823,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_TOTAL_MS.name()), 0);
Assert.assertEquals(1, metricsTestRegistrar.getCounterValue(SiembolMetrics.HEARTBEAT_MESSAGES_READ.name()));
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_TOTAL_MS.getMetricName()), 0);
Assert.assertEquals(1, metricsTestRegistrar.getCounterValue(SiembolMetrics.HEARTBEAT_MESSAGES_READ.getMetricName()));
}
@Test
@@ -100,7 +106,7 @@ public class HeartbeatConsumerTest {
testInputTopic = testDriver.createInputTopic(inputTopic, Serdes.String().serializer(),
Serdes.String().serializer());
testInputTopic.pipeInput("test");
Assert.assertEquals(1, metricsTestRegistrar.getCounterValue(SiembolMetrics.HEARTBEAT_CONSUMER_ERROR.name()));
Assert.assertEquals(1, metricsTestRegistrar.getCounterValue(SiembolMetrics.HEARTBEAT_CONSUMER_ERROR.getMetricName()));
}
@Test
@@ -114,10 +120,49 @@ public class HeartbeatConsumerTest {
testInputTopic.pipeInput(heartbeatMessageWithoutEnrichmentStr);
Assert.assertEquals(1,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_PARSING_MS.name()), 0);
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_PARSING_MS.getMetricName()), 0);
Assert.assertEquals(30,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_RESPONDING_MS.name()), 0);
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_RESPONDING_MS.getMetricName()), 0);
Assert.assertEquals(823,
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_TOTAL_MS.name()), 0);
metricsTestRegistrar.getGaugeValue(SiembolMetrics.HEARTBEAT_LATENCY_TOTAL_MS.getMetricName()), 0);
}
@Test(expected = IllegalArgumentException.class)
public void missingEnabledServices() {
properties.setEnabledServices(null);
new HeartbeatConsumer(properties, metricsTestRegistrar, streamsFactory);
}
@Test
public void healthUpCreated() {
var consumer = new HeartbeatConsumer(properties, metricsTestRegistrar, streamsFactory);
when(kafkaStreams.state()).thenReturn(KafkaStreams.State.CREATED);
Health health = consumer.checkHealth();
Assert.assertEquals(Status.UP, health.getStatus());
}
@Test
public void healthUpRunning() {
var consumer = new HeartbeatConsumer(properties, metricsTestRegistrar, streamsFactory);
when(kafkaStreams.state()).thenReturn(KafkaStreams.State.RUNNING);
Health health = consumer.checkHealth();
Assert.assertEquals(Status.UP, health.getStatus());
}
@Test
public void healthUpRebalancing() {
var consumer = new HeartbeatConsumer(properties, metricsTestRegistrar, streamsFactory);
when(kafkaStreams.state()).thenReturn(KafkaStreams.State.REBALANCING);
Health health = consumer.checkHealth();
Assert.assertEquals(Status.UP, health.getStatus());
}
@Test
public void healthDownError() {
var consumer = new HeartbeatConsumer(properties, metricsTestRegistrar, streamsFactory);
when(kafkaStreams.state()).thenReturn(KafkaStreams.State.ERROR);
Health health = consumer.checkHealth();
Assert.assertEquals(Status.DOWN, health.getStatus());
}
}

15
deployment/siembol-monitoring/src/test/java/uk/co/gresearch/siembol/deployment/monitoring/heartbeat/HeartbeatProducerTest.java
View File

@@ -7,6 +7,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.boot.actuate.health.Health;
import uk.co.gresearch.siembol.common.metrics.SiembolMetrics;
import uk.co.gresearch.siembol.common.metrics.test.SiembolMetricsTestRegistrar;
@@ -50,6 +51,7 @@ public class HeartbeatProducerTest {
heartbeatProducer.sendHeartbeat();
Assert.assertEquals(2,
metricsTestRegistrar.getCounterValue(SiembolMetrics.HEARTBEAT_MESSAGES_SENT.getMetricName("p")));
Assert.assertEquals(heartbeatProducer.checkHealth(), Health.up().build());
}
@Test
@@ -66,6 +68,19 @@ public class HeartbeatProducerTest {
heartbeatProducer.sendHeartbeat();
Assert.assertEquals(1,
metricsTestRegistrar.getCounterValue(SiembolMetrics.HEARTBEAT_PRODUCER_ERROR.getMetricName("p")));
Assert.assertEquals(heartbeatProducer.checkHealth(),
Health.down(new IllegalArgumentException("Topic cannot be null.")).build());
}
@Test(expected = IllegalArgumentException.class)
public void propertiesNullError() {
var producer = new MockProducer<>(true, new StringSerializer(), new StringSerializer());
new HeartbeatProducer(
null,
"p",
heartbeatMessageProperties,
metricsTestRegistrar,
x -> producer);
}
}

4
deployment/storm-topology-manager/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencyManagement>
@@ -43,7 +43,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

6
enriching/enriching-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,12 +35,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

4
enriching/enriching-storm/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>enriching-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

2
enriching/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<modules>
<module>enriching-core</module>

6
parsing/parsing-app/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -39,12 +39,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>

4
parsing/parsing-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -50,7 +50,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>

4
parsing/parsing-storm/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -75,7 +75,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>parsing-app</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>

2
parsing/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<modules>
<module>parsing-core</module>

2
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<name>siembol</name>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<description>A scalable, advanced security analytics framework based on open-source big data technologies.</description>
<inceptionYear>2019</inceptionYear>
<url>https://siembol.io/</url>

2
responding/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<modules>
<module>responding-core</module>

6
responding/responding-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
@@ -35,12 +35,12 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>alerting-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>

6
responding/responding-stream/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencyManagement>
<dependencies>
@@ -51,7 +51,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol-common</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>responding-core</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>

2
siembol-common/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>uk.co.gresearch.siembol</groupId>
<artifactId>siembol</artifactId>
<version>2.5.14-SNAPSHOT</version>
<version>2.5.15-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>

12
siembol-common/src/main/java/uk/co/gresearch/siembol/common/metrics/SiembolMetrics.java
View File

@@ -56,12 +56,12 @@ public enum SiembolMetrics {
CONFIG_EDITOR_REST_RELEASE_PR_SERVICE("siembol_counter_release_pr_%s"),
CONFIG_EDITOR_REST_ADMIN_CONFIG_PR_SERVICE("siembol_counter_admin_counfig_pr_%s"),
HEARTBEAT_MESSAGES_SENT("siembol_counter_hearbeat_messages_sent_%s"),
HEARTBEAT_MESSAGES_READ("siembol_counter_hearbeat_messages_read"),
HEARTBEAT_LATENCY_PARSING_MS("siembol_gauge_hearbeat_latency_ms_parsing"),
HEARTBEAT_LATENCY_ENRICHING_MS("siembol_gauge_hearbeat_latency_ms_enriching"),
HEARTBEAT_LATENCY_RESPONDING_MS("siembol_gauge_hearbeat_latency_ms_responding"),
HEARTBEAT_LATENCY_TOTAL_MS("siembol_gauge_hearbeat_latency_ms_total"),
HEARTBEAT_MESSAGES_SENT("siembol_counter_heartbeat_messages_sent_%s"),
HEARTBEAT_MESSAGES_READ("siembol_counter_heartbeat_messages_read"),
HEARTBEAT_LATENCY_PARSING_MS("siembol_gauge_heartbeat_latency_ms_parsing"),
HEARTBEAT_LATENCY_ENRICHING_MS("siembol_gauge_heartbeat_latency_ms_enriching"),
HEARTBEAT_LATENCY_RESPONDING_MS("siembol_gauge_heartbeat_latency_ms_responding"),
HEARTBEAT_LATENCY_TOTAL_MS("siembol_gauge_heartbeat_latency_ms_total"),
HEARTBEAT_PRODUCER_ERROR("siembol_counter_heartbeat_producer_error_%s"),
HEARTBEAT_CONSUMER_ERROR("siembol_counter_heartbeat_consumer_error");