Skip to content

Implement and document Loki appender for Karaf event bus #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lerb123 wants to merge 6 commits into
base: feature/merlot
Choose a base branch
from
Open

Implement and document Loki appender for Karaf event bus #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e6e127
feat: Implement Loki appender for Karaf event bus
Lerb123 May 11, 2026
f244a69
fix: Implement Loki appender for Karaf event bus, added comments.
Lerb123 May 11, 2026
45d0bc4
feat: Functional test for Loki Appender using WireMock
Lerb123 May 14, 2026
69c7037
feat: CI Pipeline for MerlotLokiAppender
Lerb123 May 14, 2026
260b2d7
Correction to the Maven configuration to prevent tests from being ski…
Lerb123 May 14, 2026
0a830ee
Correction to Maven configuration: local cache is disabled
Lerb123 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions plc4j/tools/merlot/.mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Dgradle.cache.local.enabled=false
3 changes: 0 additions & 3 deletions plc4j/tools/merlot/anahata.md
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions plc4j/tools/merlot/merlot.iml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/org.apache.plc4x.merlot.archiver.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<sourceFolder url="file://$MODULE_DIR$/src/test/src/test/resources" type="java-test-resource" />
</content>
</component>
</module>
99 changes: 85 additions & 14 deletions plc4j/tools/merlot/org.apache.plc4x.merlot.archiver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>merlot</artifactId>
<groupId>org.apache.plc4x</groupId>
<version>0.13.0-SNAPSHOT</version>
</parent>
<artifactId>merlot</artifactId>
<groupId>org.apache.plc4x</groupId>
<version>0.13.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.plc4x.merlot.archiver</groupId>
<artifactId>org.apache.plc4x.merlot.archiver</artifactId>
Expand All @@ -34,6 +34,19 @@
<name>PLC4J: Merlot :: archiver :: Historical archive </name>
<description>decanter OSGi blueprint bundle project.</description>

<properties>

<lombok.version>1.18.46</lombok.version>
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>6.0.3</junit-jupiter.version>
<mockito-junit-jupiter.version>5.23.0</mockito-junit-jupiter.version>
<wiremock.version>3.13.2</wiremock.version>
<wiremock-junit5.version>1.1.0</wiremock-junit5.version>
<junit-platform.version>6.0.3</junit-platform.version>
<cucumber-java.version>7.34.3</cucumber-java.version>
<cucumber-junit-platform-engine.version>7.34.3</cucumber-junit-platform-engine.version>
</properties>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -62,8 +75,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
<source>21</source>
<target>21</target>
<maxmem>256M</maxmem>
</configuration>
</plugin>
Expand Down Expand Up @@ -107,10 +120,10 @@
<file>src/main/cfg/org.apache.plc4x.merlot.collector.log-alarm.cfg</file>
<type>cfg5</type>
</artifact>
<!-- <artifact>
<file>src/main/cfg/org.apache.plc4x.merlot.pvcomplex.cfg</file>
<artifact>
<file>src/main/cfg/org.apache.plc4x.merlot.loki.appender.cfg</file>
<type>cfg7</type>
</artifact> -->
</artifact>
</artifacts>
</configuration>
</execution>
Expand Down Expand Up @@ -227,19 +240,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.10.3</version>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.10.3</version>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.10.3</version>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -266,15 +279,73 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<version>${junit.version}</version>
<scope>test</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.42</version>
<version>${lombok.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.decanter</groupId>
<artifactId>org.apache.karaf.decanter.api</artifactId>
<version>2.10.0</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito-junit-jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.mkammerer.wiremock-junit5</groupId>
<artifactId>wiremock-junit5</artifactId>
<version>${wiremock-junit5.version}</version>
<scope>test</scope>
<type>jar</type>
</dependency>

<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>${junit-platform.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
<version>${junit-platform.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<version>${cucumber-java.version}</version>
</dependency>

<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit-platform-engine</artifactId>
<version>${cucumber-junit-platform-engine.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-engine</artifactId>
<version>${junit-platform.version}</version> <scope>test</scope>
</dependency>
</dependencies>
</project>
39 changes: 39 additions & 0 deletions ...t/org.apache.plc4x.merlot.archiver/src/main/cfg/org.apache.plc4x.merlot.loki.appender.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
################################################################################
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You 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.
#
################################################################################
#Server Parameters
#loki.url: Loki server IP address and port
#loki.username: User configured on the Loki server
#loki.password: Password configured on the Loki server

################################################################################
#loki.url=http://127.0.0.1:3100/loki/api/v1/push

# Authentication (optional)
#loki.username=loki
#loki.password=loki

#Allowed topics (separated by commas). General topics: merlot/*, phoebus/*, iotdb/*, decanter/*
#loki.topics=decanter/collect/log,decanter/collect/metric,phoebus/data/test,merlot/archiver/test

# Static labels (always added)
#loki.label.job=merlot
#loki.label.env=dev
#loki.label.app=plc4x-archiver
#loki.label.logLevel=INFO
#loki.label.component=archiver
Loading