Merge branch 'dev' of https://github.com/muyangye/streampipes into dev

.github/workflows/pypi-deployment.yml

@@ -48,7 +48,7 @@ jobs:
         working-directory: ./streampipes-client-python
         run: |
           poetry build
-          twine check --strict dist/*
+          poetry run twine check --strict dist/*
 
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1
@@ -59,7 +59,7 @@ jobs:
       - name: Publish new doc version and update alias
         working-directory: ./streampipes-client-python
         run: |
-          mike deploy ${GITHUB_REF##*/} latest -u --deploy-prefix ./streampipes-client-python/docs-tmp -b ${GITHUB_REF}
+          poetry run mike deploy ${GITHUB_REF##*/} latest -u --deploy-prefix ./streampipes-client-python/docs-tmp -b ${GITHUB_REF}
           git reset --hard  # undo local changes that delete generated doc files
 
       - name: Publish Python docs as artifact

pom.xml

@@ -54,7 +54,7 @@
 	<fogsy-qudt.version>1.0</fogsy-qudt.version>
 	<fst.version>2.57</fst.version>
 	<geojson-jackson.version>1.14</geojson-jackson.version>
-	<guava.version>32.0.1-jre</guava.version>
+	<guava.version>32.1.2-jre</guava.version>
 	<gson.version>2.10</gson.version>
 	<hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
 	<httpclient.version>4.5.13</httpclient.version>
@@ -66,7 +66,7 @@
 	<jackson.version>2.15.0</jackson.version>
 	<jackson.databind.version>2.15.0</jackson.databind.version>
 	<jakarta-annotation.version>2.1.1</jakarta-annotation.version>
-	<jakarta-activation-api.version>2.1.2</jakarta-activation-api.version>
+	<jakarta-activation-api.version>2.0.1</jakarta-activation-api.version>
 	<jakarta-json-api.version>2.1.1</jakarta-json-api.version>
 	<jakarta-inject-api.version>2.0.1</jakarta-inject-api.version>
 	<jakarta-mail.version>2.0.1</jakarta-mail.version>
@@ -111,10 +111,10 @@
 	<rendersnake.version>1.9.0</rendersnake.version>
 	<roaster.version>2.29.0.Final</roaster.version>
 	<siddhi.version>5.1.27</siddhi.version>
-	<simple-java-mail.version>7.8.0</simple-java-mail.version>
+	<simple-java-mail.version>8.1.3</simple-java-mail.version>
 	<slf4j.version>2.0.6</slf4j.version>
 	<snakeyaml.version>2.1</snakeyaml.version>
-	<snappy-java.version>1.1.10.1</snappy-java.version>
+	<snappy-java.version>1.1.10.4</snappy-java.version>
 	<spring.version>6.0.10</spring.version>
 	<spring-boot.version>3.1.0</spring-boot.version>
 	<spring-security.version>6.1.1</spring-security.version>
@@ -129,7 +129,7 @@
 
 	<!-- Test dependencies -->
 	<junit.version>4.13.2</junit.version>
-	<mockito.version>5.4.0</mockito.version>
+	<mockito.version>5.5.0</mockito.version>
 	<powermock.version>2.0.9</powermock.version>
 	<rest-assured.version>2.9.0</rest-assured.version>
 	<wiremock.version>2.27.2</wiremock.version>
@@ -140,7 +140,7 @@
 
 	<amqp-client.version>5.18.0</amqp-client.version>
 	<animal-sniffer-annotations.version>1.23</animal-sniffer-annotations.version>
-	<boofcv.version>0.44</boofcv.version>
+	<boofcv.version>1.1.0</boofcv.version>
 	<bcprov.version>1.70</bcprov.version>
 	<bcpkix.version>1.69</bcpkix.version>
 	<classindex.version>3.9</classindex.version>
@@ -188,7 +188,7 @@
 	<commons-collections4.version>4.4</commons-collections4.version>
 	<eclipse.milo.version>0.6.9</eclipse.milo.version>
 	<netty.version>4.1.72.Final</netty.version>
-	<nimbus-jose-jwt.version>9.31</nimbus-jose-jwt.version>
+	<nimbus-jose-jwt.version>9.35</nimbus-jose-jwt.version>
 	<opencsv.version>5.8</opencsv.version>
 	<plc4x.version>0.10.0</plc4x.version>
 	<protobuf.version>3.24.0</protobuf.version>
@@ -208,6 +208,8 @@
 	<mave-release-plugin.version>3.0.0-M5</mave-release-plugin.version>
 	<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 	<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
+	<micrometer-prometheus.version>1.11.0</micrometer-prometheus.version>
+	<micrometer-observation.version>1.11.0</micrometer-observation.version>
 </properties>
 
     <name>Apache StreamPipes</name>
@@ -860,6 +862,11 @@
 					<artifactId>spring-boot-starter-web</artifactId>
 					<version>${spring-boot.version}</version>
 				</dependency>
+				<dependency>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-actuator</artifactId>
+					<version>${spring-boot.version}</version>
+				</dependency>
 				<dependency>
 					<groupId>org.wildfly.common</groupId>
 					<artifactId>wildfly-common</artifactId>
@@ -1329,6 +1336,16 @@
                 <artifactId>kotlin-stdlib</artifactId>
                 <version>${kotlin-stdlib.version}</version>
             </dependency>
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-registry-prometheus</artifactId>
+				<version>${micrometer-prometheus.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>io.micrometer</groupId>
+				<artifactId>micrometer-observation</artifactId>
+				<version>${micrometer-observation.version}</version>
+			</dependency>
         </dependencies>
     </dependencyManagement>
 

prometheus-grafana/README.md

@@ -0,0 +1,29 @@
+<!--
+  ~ 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.
+  ~
+  -->
+
+
+##Prometheus Configuration
+In the [dashboards](./prometheus) directory, you can find sample configuration file for Prometheus.
+
+## Grafana Dashboards
+
+In the [dashboards](./grafana/dashboards) directory, you can find sample grafana dashboards for several StreamPipes components.
+
+
+##note
+The metrics displayed in the [dashboards](. /grafana/dashboards) directory dashboards show metrics that have a filter condition related to the job_name, if you change the job_name in the example you must also change the condition in the grafana dashboard.