CHANGELOG.md

@@ -7,6 +7,48 @@
 <!-- !!! ⚠️ DO NOT MODIFY THIS FILE, YOUR CHANGES WILL BE LOST ⚠️ !!! -->
 
 
+[2.4.0] - 2024-11-27
+--------------------
+
+### Added (1 change)
+
+- Added support for H2 datasource type !56 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+
+### Fixed (1 change)
+
+- Fixed an issue with registering hofund.node, caused by inconsistent sets of tag keys across different connection types !58 !59 #57 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+
+
+[2.3.0] - 2024-11-20
+--------------------
+
+### Added (2 changes)
+
+- Added vendor information about db connection !50 #3 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+- Added more precise OS metrics !52 #31 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+
+
+[2.2.0] - 2024-07-16
+--------------------
+
+### Added (1 change)
+
+- Added request headers and ability to define it during testing connection using `AbstractHofundBasicHttpConnection` !45 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+
+### Changed (1 change)
+
+- Sorting connections tabel by type !45 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+
+
+[2.1.0] - 2024-07-14
+--------------------
+
+### Added (2 changes)
+
+- Added `SimpleHofundHttpConnection` to simplified configuration of HTTP connections and added ability to override `getRequestMethod()` in `AbstractHofundBasicHttpConnection` to allow using `POST` method. !42 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+- Added `HofundConnectionsTable` to allow printing HofundConnection to terminal during booting up. !43 #26 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+
+
 [2.0.0] - 2024-06-30
 --------------------
 

README.md

@@ -156,7 +156,7 @@ hofund:
       version: @project.version@
 ```
 
-You can also overrride custom values for `GitInfo` metrics
+You can also override custom values for `GitInfo` metrics
 ```properties
 hofund.git-info.commit.id=someid  # default value is equal to git.commit.id property from git.properties file generated by git-commit-id-maven-plugin
 hofund.git-info.commit.id-abbrev=someAbbrevId # default value is equal to git.commit.id.abbrev
@@ -185,7 +185,31 @@ hofund_git_info{branch="master",build_host="DESKTOP-AAAAA",build_time="2023-02-1
 ### 4. Testing connections
 
 You can define your own `HofundConnectionsProvider` but if you want to test HTTP connection the easiest way
-is to extend `AbstractHofundBasicHttpConnection`. If your project is based on spring you can extend it like below:
+is to configure `SimpleHofundHttpConnection` or extend `AbstractHofundBasicHttpConnection`. If your project is based on spring you can extend it like below:
+
+```java
+package dev.logchange.hofund.testapp.stats.health;
+import dev.logchange.hofund.connection.SimpleHofundHttpConnection;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Bean;
+
+@Configuration
+public class SimpleHofundHttpConnectionConfiguration {
+    
+    @Bean 
+    public SimpleHofundHttpConnection paymentApiSimpleHofundHttpConnection(){
+        return new SimpleHofundHttpConnection("payment-api", "http://host.docker.internal:18083/actuator/health/info");
+    }
+
+    @Bean
+    public SimpleHofundHttpConnection cartApiSimpleHofundHttpConnection(){
+        return new SimpleHofundHttpConnection("car-api", "http://host.docker.internal:18084/actuator/health/info");
+    }
+}
+
+
+```
 
 ```java
 
@@ -205,7 +229,7 @@ public class PaymentsHealthCheck extends AbstractHofundBasicHttpConnection {
     @Value("${hofund.connection.payment.url:http://host.docker.internal:18083/}")
     private String basicUrl;
 
-    @Value("${hofund.connection.payment.url.suffix:actuator/health}")
+    @Value("${hofund.connection.payment.url.suffix:actuator/health/info}")
     private String urlSuffix;
 
     @Override
@@ -225,6 +249,10 @@ public class PaymentsHealthCheck extends AbstractHofundBasicHttpConnection {
 Extending `AbstractHofundBasicHttpConnection` is really simple, you only have to overrider `getTarget()`
 and `getUrl()` methods. The example above allows you to change values through spring application properties.
 
+If you want to use f.e `POST` method, you can use `new SimpleHofundHttpConnection("abc", "some_url", RequestMethod.POST)` or override `getRquestMethod()`.
+
+If you don't want to test connection in some conditions, you can use `new SimpleHofundHttpConnection("abc", "some_url", CheckingStatus.INACTIVE)` or override `getCheckingStatus()`.
+
 ### 5. Metrics description
 
 - `hofund_info` - used to detect if application is running and what version is used. Application name and id
@@ -246,6 +274,39 @@ and `getUrl()` methods. The example above allows you to change values through sp
     - PostgreSQL
     - Oracle
 
+### 7. Connection Tabel
+
+This simple functionality allows to print connections status in logger during booting up!
+
+```txt
++----------+--------------+----------+----------------------------------------------+
+| TYPE     | NAME         | STATUS   | URL                                          |
++----------+--------------+----------+----------------------------------------------+
+| DATABASE | mydb         | UP       | jdbc:postgresql://localhost:5432/mydb        |
+| DATABASE | mydb2        | UP       | jdbc:mysql://localhost:3306/mydb2            |
+| DATABASE | orcl         | DOWN     | jdbc:oracle:thin:@localhost:1521:orcl        |
+| HTTP     | external-api | UP       | https://api.external-service.com             |
+| HTTP     | internal-api | UP       | https://api.internal-service.local           |
+| HTTP     | public-API   | INACTIVE | https://api.public-service.com               |
++----------+--------------+----------+----------------------------------------------+
+```
+
+You can achieve this by creating simple class:
+
+```java
+@Slf4j
+@Configuration
+public class PrintHofundConnectionsTabel {
+
+    @Bean
+    public CommandLineRunner demo(HofundConnectionsTable connectionsTable) {
+        return (args) -> {
+            log.info(connectionsTable.print());
+        };
+    }
+}
+```
+
 # Grafana Dashboards
 
 ## [hofund-node-graph.json](https://github.com/logchange/hofund/raw/master/grafana-dashboards/hofund-node-graph.json)

changelog/unreleased/000061-maven-deployment-config.yml

@@ -0,0 +1,12 @@
+title: Changed maven deployment configuration. Updated modules descriptions.
+authors:
+  - name: Mateusz Witkowski
+    nick: witx98
+    url: https://github.com/witx98
+type: changed #[added/changed/deprecated/removed/fixed/security/other]
+issues:
+  - 61
+merge_requests:
+  - 62
+  - 63
+  - 64

changelog/v2.1.0/000001-simple_http_connections.yml

@@ -0,0 +1,9 @@
+title: Added `SimpleHofundHttpConnection` to simplified configuration of HTTP connections and added ability to override 
+  `getRequestMethod()` in `AbstractHofundBasicHttpConnection` to allow using `POST` method.
+authors:
+  - name: Peter Zmilczak
+    nick: marwin1991
+    url: https://github.com/marwin1991
+type: added #[added/changed/deprecated/removed/fixed/security/other]
+merge_requests:
+  - 42

changelog/v2.1.0/000002-print_connections_to_terminal.yml

@@ -0,0 +1,10 @@
+title: Added `HofundConnectionsTable` to allow printing HofundConnection to terminal during booting up.
+authors:
+  - name: Peter Zmilczak
+    nick: marwin1991
+    url: https://github.com/marwin1991
+type: added #[added/changed/deprecated/removed/fixed/security/other]
+issues:
+  - 26
+merge_requests:
+  - 43

changelog/v2.1.0/release-date.txt

@@ -0,0 +1 @@
+2024-07-14

changelog/v2.1.0/version-summary.md

@@ -0,0 +1,18 @@
+<!-- @formatter:off -->
+<!-- noinspection -->
+<!-- Prevents auto format, for JetBrains IDE File > Settings > Editor > Code Style (Formatter Tab) > Turn formatter on/off with markers in code comments  -->
+
+<!-- This file is automatically generate by logchange tool 🌳 🪓 => 🪵 -->
+<!-- Visit https://github.com/logchange/logchange and leave a star 🌟 -->
+<!-- !!! ⚠️ DO NOT MODIFY THIS FILE, YOUR CHANGES WILL BE LOST ⚠️ !!! -->
+
+
+[2.1.0] - 2024-07-14
+--------------------
+
+### Added (2 changes)
+
+- Added `SimpleHofundHttpConnection` to simplified configuration of HTTP connections and added ability to override `getRequestMethod()` in `AbstractHofundBasicHttpConnection` to allow using `POST` method. !42 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+- Added `HofundConnectionsTable` to allow printing HofundConnection to terminal during booting up. !43 #26 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+
+

changelog/v2.2.0/000001-sorting_connections_tabel_by_type.yml

@@ -0,0 +1,8 @@
+title: Sorting connections tabel by type
+authors:
+  - name: Peter Zmilczak
+    nick: marwin1991
+    url: https://github.com/marwin1991
+type: changed #[added/changed/deprecated/removed/fixed/security/other]
+merge_requests:
+  - 45

changelog/v2.2.0/000002-request_headers_for_http_connections.yml

@@ -0,0 +1,8 @@
+title: Added request headers and ability to define it during testing connection using  `AbstractHofundBasicHttpConnection`
+authors:
+  - name: Peter Zmilczak
+    nick: marwin1991
+    url: https://github.com/marwin1991
+type: added #[added/changed/deprecated/removed/fixed/security/other]
+merge_requests:
+  - 45

changelog/v2.2.0/release-date.txt

@@ -0,0 +1 @@
+2024-07-16

changelog/v2.2.0/version-summary.md

@@ -0,0 +1,21 @@
+<!-- @formatter:off -->
+<!-- noinspection -->
+<!-- Prevents auto format, for JetBrains IDE File > Settings > Editor > Code Style (Formatter Tab) > Turn formatter on/off with markers in code comments  -->
+
+<!-- This file is automatically generate by logchange tool 🌳 🪓 => 🪵 -->
+<!-- Visit https://github.com/logchange/logchange and leave a star 🌟 -->
+<!-- !!! ⚠️ DO NOT MODIFY THIS FILE, YOUR CHANGES WILL BE LOST ⚠️ !!! -->
+
+
+[2.2.0] - 2024-07-16
+--------------------
+
+### Added (1 change)
+
+- Added request headers and ability to define it during testing connection using `AbstractHofundBasicHttpConnection` !45 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+
+### Changed (1 change)
+
+- Sorting connections tabel by type !45 ([Peter Zmilczak](https://github.com/marwin1991) @marwin1991)
+
+

changelog/v2.3.0/000003-db-type.yml

@@ -0,0 +1,10 @@
+title: Added vendor information about db connection
+authors:
+  - name: Mateusz Witkowski
+    nick: witx98
+    url: https://github.com/witx98
+type: added #[added/changed/deprecated/removed/fixed/security/other]
+issues:
+  - 3
+merge_requests:
+  - 50

changelog/v2.3.0/000031-os-metric.yml

@@ -0,0 +1,10 @@
+title: Added more precise OS metrics
+authors:
+  - name: Mateusz Witkowski
+    nick: witx98
+    url: https://github.com/witx98
+type: added #[added/changed/deprecated/removed/fixed/security/other]
+issues:
+  - 31
+merge_requests:
+  - 52

changelog/v2.3.0/release-date.txt

@@ -0,0 +1 @@
+2024-11-20

changelog/v2.3.0/version-summary.md

@@ -0,0 +1,18 @@
+<!-- @formatter:off -->
+<!-- noinspection -->
+<!-- Prevents auto format, for JetBrains IDE File > Settings > Editor > Code Style (Formatter Tab) > Turn formatter on/off with markers in code comments  -->
+
+<!-- This file is automatically generate by logchange tool 🌳 🪓 => 🪵 -->
+<!-- Visit https://github.com/logchange/logchange and leave a star 🌟 -->
+<!-- !!! ⚠️ DO NOT MODIFY THIS FILE, YOUR CHANGES WILL BE LOST ⚠️ !!! -->
+
+
+[2.3.0] - 2024-11-20
+--------------------
+
+### Added (2 changes)
+
+- Added vendor information about db connection !50 #3 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+- Added more precise OS metrics !52 #31 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+
+

changelog/v2.4.0/000001-h2-connection.yml

@@ -0,0 +1,12 @@
+# This file is used by logchange tool to generate CHANGELOG.md 🌳 🪓 => 🪵 
+# Visit https://github.com/logchange/logchange and leave a star 🌟 
+# More info about configuration you can find https://github.com/logchange/logchange#yaml-format ⬅️⬅ ️
+title: Added support for H2 datasource type
+authors:
+  - name: Mateusz Witkowski
+    nick: witx98
+    url: https://github.com/witx98
+merge_requests:
+  - 56
+type: added
+

changelog/v2.4.0/000057-connection-tags-fix.yml

@@ -0,0 +1,11 @@
+title: Fixed an issue with registering hofund.node, caused by inconsistent sets of tag keys across different connection types
+authors:
+  - name: Mateusz Witkowski
+    nick: witx98
+    url: https://github.com/witx98
+type: fixed #[added/changed/deprecated/removed/fixed/security/other]
+issues:
+  - 57
+merge_requests:
+  - 58
+  - 59

changelog/v2.4.0/release-date.txt

@@ -0,0 +1 @@
+2024-11-27

changelog/v2.4.0/version-summary.md

@@ -0,0 +1,21 @@
+<!-- @formatter:off -->
+<!-- noinspection -->
+<!-- Prevents auto format, for JetBrains IDE File > Settings > Editor > Code Style (Formatter Tab) > Turn formatter on/off with markers in code comments  -->
+
+<!-- This file is automatically generate by logchange tool 🌳 🪓 => 🪵 -->
+<!-- Visit https://github.com/logchange/logchange and leave a star 🌟 -->
+<!-- !!! ⚠️ DO NOT MODIFY THIS FILE, YOUR CHANGES WILL BE LOST ⚠️ !!! -->
+
+
+[2.4.0] - 2024-11-27
+--------------------
+
+### Added (1 change)
+
+- Added support for H2 datasource type !56 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+
+### Fixed (1 change)
+
+- Fixed an issue with registering hofund.node, caused by inconsistent sets of tag keys across different connection types !58 !59 #57 ([Mateusz Witkowski](https://github.com/witx98) @witx98)
+
+

grafana-dashboards/hofund-node-graph.json

@@ -87,7 +87,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "    (sum by (id, source, target, type) (0 * sum_over_time(hofund_edge[1w])))\r\n  * on (id) group_left (mainstat)\r\n    (\r\n      count_values without () (\r\n        \"mainstat\",\r\n        sum by (id) (sum by (id) (sum without () (hofund_connection) or (0 * sum_over_time(hofund_connection[1d]))))\r\n      )\r\n    )\r\n* on (id) group_left (secondarystat)\r\n  (\r\n    count_values without () (\r\n      \"secondarystat\",\r\n      round(\r\n        avg_over_time(((sum without () (hofund_connection) or (0 * sum_over_time(hofund_connection[1d]))) >= 0)[1d:5m]),\r\n        0.001\r\n      )\r\n    )\r\n  )",
+          "expr": "    (sum by (id, source, target, type) (0 * sum_over_time(hofund_edge[1w])))\r\n  * on (id) group_left (mainstat)\r\n    (\r\n      count_values without () (\r\n        \"mainstat\",\r\n        sum by (id) (sum by (id) (sum without () (hofund_connection) or (0 * sum_over_time(hofund_connection[1d]))))\r\n      )\r\n    )\r\n* on (id) group_left (secondarystat)\r\n  (\r\n    count_values without () (\r\n      \"secondarystat\",\r\n      round(\r\n        avg_over_time(((sum without () (hofund_connection) or (0 * sum_over_time(hofund_connection[1d]))))[1d:5m]),\r\n        0.001\r\n      )\r\n    )\r\n  )",
           "format": "table",
           "hide": false,
           "instant": true,
@@ -116,4 +116,4 @@
   "uid": "jF_6aHZ4z",
   "version": 2,
   "weekStart": ""
-}
+}

hofund-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>dev.logchange.hofund</groupId>
         <artifactId>hofund</artifactId>
-        <version>2.0.0</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>hofund-core</artifactId>
@@ -30,5 +30,18 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.oshi</groupId>
+            <artifactId>oshi-core</artifactId>
+            <version>${oshi-core.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>${mockwebserver.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>