Update dependencies (#1641)

* update dependencies * update documentation
inspectIT · Jan 16, 2024 · fceebaa · fceebaa
1 parent 264f26c
commit fceebaa
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 15 deletions.
diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml
@@ -2,8 +2,8 @@
 ioJsonwebtoken = "0.12.3"
 orgEclipseJgit = "6.8.0.202311291450-r"
 orgMockito = "4.7.0"
-orgSpringframeworkBoot = { strictly = "3.1.6" }
-orgSpringframeworkSecurity = "6.1.5"
+orgSpringframeworkBoot = { strictly = "3.1.7" }
+orgSpringframeworkSecurity = "6.1.6"
 
 [libraries]
 comGoogleCodeGson = "com.google.code.gson:gson:2.10.1"
@@ -24,7 +24,7 @@ orgSpringframeworkBootSpringBootStarterDataJpa = { module = "org.springframework
 orgSpringframeworkBootSpringBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "orgSpringframeworkBoot" }
 orgSpringframeworkBootSpringBootStarterWeb = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "orgSpringframeworkBoot" }
 orgSpringframeworkBootSpringBootStartervalidation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "orgSpringframeworkBoot" }
-orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.0"
+orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.1"
 orgSpringframeworkSecuritySpringSecurityLdap = { module = "org.springframework.security:spring-security-ldap", version.ref = "orgSpringframeworkSecurity" }
 orgSpringframeworkSecuritySpringSecurityTest = { module = "org.springframework.security:spring-security-test", version.ref = "orgSpringframeworkSecurity" }
 orgSpringframeworkSecuritySpringSecurityWeb = { module = "org.springframework.security:spring-security-web", version.ref = "orgSpringframeworkSecurity" }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,15 +12,16 @@ orgEclipseJetty = "9.4.53.v20231009"
 # @pin Starting with version 6.x requires Java 11
 orgJunitJupiter = "5.8.2"
 orgMockito = "4.7.0"
-orgSlf4j = "2.0.9"
+orgSlf4j = "2.0.11"
 orgSpringframework = "5.3.31"
-# @pin 2.7 is the latest release line which runs on Java 8
+# @pin 2.7.18 is the latest release which runs on Java 8, this version marks the en of open source support for Sb 2.x
 orgSpringframeworkBoot = "2.7.18"
 orgTestcontainers = "1.18.3"
 
 [libraries]
 # @pin 1.3.* are the latest versions, which support java 8
 chQosLogbackLogbackClassic = "ch.qos.logback:logback-classic:1.2.13"
+# @pin 2.13.5 since this version is used by Spring Boot 2.7.18
 comFasterxmlJacksonCoreJacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.13.5"
 # @pin Wiremock 3.* doesn't support java 8
 comGithubTomakehurstWiremockJre8 = "com.github.tomakehurst:wiremock-jre8:2.35.1"
@@ -72,7 +73,7 @@ orgApacheCommonsCommonsMath3 = "org.apache.commons:commons-math3:3.6.1"
 orgApacheHttpcomponentsHttpclient = "org.apache.httpcomponents:httpclient:4.5.14"
 orgApacheLoggingLog4jLog4jApi = { module = "org.apache.logging.log4j:log4j-api", version.ref = "orgApacheLoggingLog4j" }
 orgApacheLoggingLog4jLog4jCore = { module = "org.apache.logging.log4j:log4j-core", version.ref = "orgApacheLoggingLog4j" }
-orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.83"
+orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.85"
 orgAssertjAssertjCore = "org.assertj:assertj-core:3.22.0"
 orgAssertjAssertjGuava = "org.assertj:assertj-guava:3.24.2"
 orgAwaitility = "org.awaitility:awaitility:4.2.0"
@@ -119,7 +120,7 @@ comGithubNodeGradleNode = "com.github.node-gradle.node:7.0.1"
 comPalantirDocker = "com.palantir.docker:0.34.0"
 ioSpringDependencyManagement = "io.spring.dependency-management:1.1.4"
 meChampeauJmh = "me.champeau.jmh:0.7.2"
-nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.1"
+nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.3"
 orgCyclonedxBom = "org.cyclonedx.bom:1.7.4"
 # @pin Last version to be compatible with java 1.8
 orgOwaspDependencycheck = "org.owasp.dependencycheck:8.2.1"

diff --git a/inspectit-ocelot-documentation/docs/assets/agent-health-icon.png b/inspectit-ocelot-documentation/docs/assets/agent-health-icon.png
diff --git a/inspectit-ocelot-documentation/docs/breaking-changes/breaking-changes.md b/inspectit-ocelot-documentation/docs/breaking-changes/breaking-changes.md
@@ -3,6 +3,31 @@ id: Breaking Changes
 title: Breaking Changes
 ---
 
+## Breaking changes in 2.6.0
+
+### Git-Staging of Agent Mappings
+
+In addition to all agent configurations, the agent mappings will be staged as well now.
+Thus, it is possible to keep a version history of the agent mappings. 
+There have been changed to the agent-mappings-page in the configuration server.
+
+Furthermore, the source branch of the entire agent mappings configuration is adjustable. 
+Now you can choose, whether the agent mappings configuration should be used from `WORKSPACE` (like previously) 
+or from `LIVE` (promoted changes).
+You can find more information [here](config-server/agent-mappings.md#Git-Staging).
+
+### Tag-Guard
+
+The Tag-Guard allows to limit the amount of tag values, which will be exported for a specific tag of a specific measure.
+This may help to prevent high cardinalities in your time series database.
+
+The recorded tag values for each tag per measure of an agent will be stored inside a local JSON file. This file serves
+as the tag-guard-database and helps to check, if tag values exceeded their limit.
+If a tag value has exceeded its limit, the agent health will change to `ERROR`. Therefore, the configured limit should be
+evaluated carefully.
+You can find more information [here](metrics/tag-guard.md).
+
+
 ## Breaking changes in 2.4.0
 
 ### Sampling adjusted

diff --git a/inspectit-ocelot-documentation/docs/config-server/agent-mappings.md b/inspectit-ocelot-documentation/docs/config-server/agent-mappings.md
@@ -40,7 +40,7 @@ This default agent mapping maps each agent to each configuration file of the `wo
 You can find more detailed information about file staging and promotion [here](config-server/files-staging.md).
 :::
 
-Since the version `2.5.7` the configuration for the agent mappings itself will also be included into the git staging. For all agent mappings 
+Since the version `2.6.0` the configuration for the agent mappings itself will also be included into the git staging. For all agent mappings 
 the configuration is stored in one file. After one or several agent mappings have been edited, the changes will also
 appear on the promotion page. The promotion of the agent mappings configuration works directly like the promotion of agent configuration files.
 

diff --git a/inspectit-ocelot-documentation/docs/config-server/status-table-view.md b/inspectit-ocelot-documentation/docs/config-server/status-table-view.md
@@ -11,9 +11,10 @@ Here is a short guide to help you navigate around the status table.
 
 ## Explanation of Highlighted Buttons
 
-| Button                                                       | Function                                                     |
-| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| ![Status Table View](assets/service-states-btn.png)<br /> **Service States** | Displays the services (e.g. Prometheus, Jaeger, Influx, Log-Preloading, Agent Command Service, ...) and their current state (`enabled`/`disabled`).<br />In the future, we plan to implement the functionality to enable/disable the services in this view. |
-| ![Status Table View](assets/logs-btn.png)<br /> **Agent Logs** | Displays the logs of the service if agent commands and log preloading are enabled. |
-| ![Status Table View](assets/config-btn.png)<br /> **Current Config** | Displays the current config in `yaml` format when the agent commands are enabled. |
-| ![Status Table View](assets/download-archive-btn.png)<br /> **Support Archive** | Downloads a support archive as a `.zip` file if the agent commands are enabled. The support archive contains logs (if log preloading is enabled), the current config, and environment details. |
+| Button                                                                          | Function                                                                                                                                                                                                                                                    |
+|---------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ![Status Table View](assets/service-states-btn.png)<br /> **Service States**    | Displays the services (e.g. Prometheus, Jaeger, Influx, Log-Preloading, Agent Command Service, ...) and their current state (`enabled`/`disabled`).<br />In the future, we plan to implement the functionality to enable/disable the services in this view. |
+| ![Status Table View](assets/logs-btn.png)<br /> **Agent Logs**                  | Displays the logs of the service if agent commands and log preloading are enabled.                                                                                                                                                                          |
+| ![Status Table View](assets/config-btn.png)<br /> **Current Config**            | Displays the current config in `yaml` format when the agent commands are enabled.                                                                                                                                                                           |
+| ![Status Table View](assets/agent-health-icon.png)<br /> **Agent State**        | Displays the current agent state and the latest agent health incidents.                                                                                                                                                                                     |
+| ![Status Table View](assets/download-archive-btn.png)<br /> **Support Archive** | Downloads a support archive as a `.zip` file if the agent commands are enabled. The support archive contains logs (if log preloading is enabled), the current config, and environment details.                                                              |
diff --git a/inspectit-ocelot-documentation/docs/metrics/tag-guard.md b/inspectit-ocelot-documentation/docs/metrics/tag-guard.md
@@ -9,7 +9,7 @@ This can be useful for controlling the amount of tag values, which will be writt
 which in turn might lead to performance or memory issues in your time series database.
 
 The recorded tag values for each measure of an agent will be stored inside a local JSON file. This file serves
-as a tag-guard-database and helps to check, if tag values exceeded their limit.
+as the tag-guard-database and helps to check, if tag values exceeded their limit.
 
 ### Configuring Tag-Guard