Skip to content

Commit fceebaa

Browse files
EddeCCCEddeCCC
authored
Update dependencies (#1641)
* update dependencies * update documentation
1 parent 264f26c commit fceebaa

File tree

7 files changed

+42
-15
lines changed

7 files changed

+42
-15
lines changed

‎gradle/configserverlibs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
ioJsonwebtoken = "0.12.3"
33
orgEclipseJgit = "6.8.0.202311291450-r"
44
orgMockito = "4.7.0"
5-
orgSpringframeworkBoot = { strictly = "3.1.6" }
6-
orgSpringframeworkSecurity = "6.1.5"
5+
orgSpringframeworkBoot = { strictly = "3.1.7" }
6+
orgSpringframeworkSecurity = "6.1.6"
77

88
[libraries]
99
comGoogleCodeGson = "com.google.code.gson:gson:2.10.1"
@@ -24,7 +24,7 @@ orgSpringframeworkBootSpringBootStarterDataJpa = { module = "org.springframework
2424
orgSpringframeworkBootSpringBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "orgSpringframeworkBoot" }
2525
orgSpringframeworkBootSpringBootStarterWeb = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "orgSpringframeworkBoot" }
2626
orgSpringframeworkBootSpringBootStartervalidation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "orgSpringframeworkBoot" }
27-
orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.0"
27+
orgSpringframeworkLdapSpringLdapCore = "org.springframework.ldap:spring-ldap-core:3.2.1"
2828
orgSpringframeworkSecuritySpringSecurityLdap = { module = "org.springframework.security:spring-security-ldap", version.ref = "orgSpringframeworkSecurity" }
2929
orgSpringframeworkSecuritySpringSecurityTest = { module = "org.springframework.security:spring-security-test", version.ref = "orgSpringframeworkSecurity" }
3030
orgSpringframeworkSecuritySpringSecurityWeb = { module = "org.springframework.security:spring-security-web", version.ref = "orgSpringframeworkSecurity" }

‎gradle/libs.versions.toml

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ orgEclipseJetty = "9.4.53.v20231009"
1212
# @pin Starting with version 6.x requires Java 11
1313
orgJunitJupiter = "5.8.2"
1414
orgMockito = "4.7.0"
15-
orgSlf4j = "2.0.9"
15+
orgSlf4j = "2.0.11"
1616
orgSpringframework = "5.3.31"
17-
# @pin 2.7 is the latest release line which runs on Java 8
17+
# @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
1818
orgSpringframeworkBoot = "2.7.18"
1919
orgTestcontainers = "1.18.3"
2020

2121
[libraries]
2222
# @pin 1.3.* are the latest versions, which support java 8
2323
chQosLogbackLogbackClassic = "ch.qos.logback:logback-classic:1.2.13"
24+
# @pin 2.13.5 since this version is used by Spring Boot 2.7.18
2425
comFasterxmlJacksonCoreJacksonDatabind = "com.fasterxml.jackson.core:jackson-databind:2.13.5"
2526
# @pin Wiremock 3.* doesn't support java 8
2627
comGithubTomakehurstWiremockJre8 = "com.github.tomakehurst:wiremock-jre8:2.35.1"
@@ -72,7 +73,7 @@ orgApacheCommonsCommonsMath3 = "org.apache.commons:commons-math3:3.6.1"
7273
orgApacheHttpcomponentsHttpclient = "org.apache.httpcomponents:httpclient:4.5.14"
7374
orgApacheLoggingLog4jLog4jApi = { module = "org.apache.logging.log4j:log4j-api", version.ref = "orgApacheLoggingLog4j" }
7475
orgApacheLoggingLog4jLog4jCore = { module = "org.apache.logging.log4j:log4j-core", version.ref = "orgApacheLoggingLog4j" }
75-
orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.83"
76+
orgApacheTomcatEmbedTomcatEmbedEl = "org.apache.tomcat.embed:tomcat-embed-el:9.0.85"
7677
orgAssertjAssertjCore = "org.assertj:assertj-core:3.22.0"
7778
orgAssertjAssertjGuava = "org.assertj:assertj-guava:3.24.2"
7879
orgAwaitility = "org.awaitility:awaitility:4.2.0"
@@ -119,7 +120,7 @@ comGithubNodeGradleNode = "com.github.node-gradle.node:7.0.1"
119120
comPalantirDocker = "com.palantir.docker:0.34.0"
120121
ioSpringDependencyManagement = "io.spring.dependency-management:1.1.4"
121122
meChampeauJmh = "me.champeau.jmh:0.7.2"
122-
nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.1"
123+
nlLittlerobotsVersionCatalogUpdate = "nl.littlerobots.version-catalog-update:0.8.3"
123124
orgCyclonedxBom = "org.cyclonedx.bom:1.7.4"
124125
# @pin Last version to be compatible with java 1.8
125126
orgOwaspDependencycheck = "org.owasp.dependencycheck:8.2.1"

‎inspectit-ocelot-documentation/docs/assets/agent-health-icon.png

937 Bytes
Loading

‎inspectit-ocelot-documentation/docs/breaking-changes/breaking-changes.md

+25
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,31 @@ id: Breaking Changes
33
title: Breaking Changes
44
---
55

6+
## Breaking changes in 2.6.0
7+
8+
### Git-Staging of Agent Mappings
9+
10+
In addition to all agent configurations, the agent mappings will be staged as well now.
11+
Thus, it is possible to keep a version history of the agent mappings.
12+
There have been changed to the agent-mappings-page in the configuration server.
13+
14+
Furthermore, the source branch of the entire agent mappings configuration is adjustable.
15+
Now you can choose, whether the agent mappings configuration should be used from `WORKSPACE` (like previously)
16+
or from `LIVE` (promoted changes).
17+
You can find more information [here](config-server/agent-mappings.md#Git-Staging).
18+
19+
### Tag-Guard
20+
21+
The Tag-Guard allows to limit the amount of tag values, which will be exported for a specific tag of a specific measure.
22+
This may help to prevent high cardinalities in your time series database.
23+
24+
The recorded tag values for each tag per measure of an agent will be stored inside a local JSON file. This file serves
25+
as the tag-guard-database and helps to check, if tag values exceeded their limit.
26+
If a tag value has exceeded its limit, the agent health will change to `ERROR`. Therefore, the configured limit should be
27+
evaluated carefully.
28+
You can find more information [here](metrics/tag-guard.md).
29+
30+
631
## Breaking changes in 2.4.0
732

833
### Sampling adjusted

‎inspectit-ocelot-documentation/docs/config-server/agent-mappings.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This default agent mapping maps each agent to each configuration file of the `wo
4040
You can find more detailed information about file staging and promotion [here](config-server/files-staging.md).
4141
:::
4242
43-
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
43+
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
4444
the configuration is stored in one file. After one or several agent mappings have been edited, the changes will also
4545
appear on the promotion page. The promotion of the agent mappings configuration works directly like the promotion of agent configuration files.
4646

‎inspectit-ocelot-documentation/docs/config-server/status-table-view.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ Here is a short guide to help you navigate around the status table.
1111

1212
## Explanation of Highlighted Buttons
1313

14-
| Button | Function |
15-
| ------------------------------------------------------------ | ------------------------------------------------------------ |
16-
| ![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. |
17-
| ![Status Table View](assets/logs-btn.png)<br /> **Agent Logs** | Displays the logs of the service if agent commands and log preloading are enabled. |
18-
| ![Status Table View](assets/config-btn.png)<br /> **Current Config** | Displays the current config in `yaml` format when the agent commands are enabled. |
19-
| ![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. |
14+
| Button | Function |
15+
|---------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
16+
| ![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. |
17+
| ![Status Table View](assets/logs-btn.png)<br /> **Agent Logs** | Displays the logs of the service if agent commands and log preloading are enabled. |
18+
| ![Status Table View](assets/config-btn.png)<br /> **Current Config** | Displays the current config in `yaml` format when the agent commands are enabled. |
19+
| ![Status Table View](assets/agent-health-icon.png)<br /> **Agent State** | Displays the current agent state and the latest agent health incidents. |
20+
| ![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. |

‎inspectit-ocelot-documentation/docs/metrics/tag-guard.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This can be useful for controlling the amount of tag values, which will be writt
99
which in turn might lead to performance or memory issues in your time series database.
1010

1111
The recorded tag values for each measure of an agent will be stored inside a local JSON file. This file serves
12-
as a tag-guard-database and helps to check, if tag values exceeded their limit.
12+
as the tag-guard-database and helps to check, if tag values exceeded their limit.
1313

1414
### Configuring Tag-Guard
1515

0 commit comments

Comments
 (0)