From fceebaaf15a62cf8a444235c6f4c8a4eab284949 Mon Sep 17 00:00:00 2001 From: Eduard Schander <66794307+EddeCCC@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:48:35 +0100 Subject: [PATCH] Update dependencies (#1641) * update dependencies * update documentation --- gradle/configserverlibs.versions.toml | 6 ++--- gradle/libs.versions.toml | 9 ++++--- .../docs/assets/agent-health-icon.png | Bin 0 -> 937 bytes .../docs/breaking-changes/breaking-changes.md | 25 ++++++++++++++++++ .../docs/config-server/agent-mappings.md | 2 +- .../docs/config-server/status-table-view.md | 13 ++++----- .../docs/metrics/tag-guard.md | 2 +- 7 files changed, 42 insertions(+), 15 deletions(-) create mode 100644 inspectit-ocelot-documentation/docs/assets/agent-health-icon.png diff --git a/gradle/configserverlibs.versions.toml b/gradle/configserverlibs.versions.toml index 10f989c38a..2bdab191bd 100644 --- 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 index 336718df20..d7268b7af1 100644 --- 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 new file mode 100644 index 0000000000000000000000000000000000000000..d8c7106f9f311707d0fc68244bf1cf3ef9e663e4 GIT binary patch literal 937 zcmV;a16KTrP)fa00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D13pPaK~z{r?U!9h zQ(+j#|JooqB^63VrK~`N3cc6}Dl#c(6j70avcfcWqOQs&!UBUn z@W#yPalIjkl!nW8SML#WZnWD~kg<}ys5gRIK) zaSI_d0X}sXlhn9{oLqkxyhe9o`#{%xJ?#^E(F?7uu(4PJvP}tMCCAv~i2~?^ib4~h z-Iqs_r<~f=>Lb-Y%p$3&knG`p5azeb2A!Q3YmEk4=4<0xA++<>h)WH94r|mu5o(SiL!WjLi-gyW(=Y_q9B^@*Ya%P#44Ier`vyg7W5i^H)vM;&$0S~;G zhUGI0SP=Af!;d@|6Z;nljAGS~?q05$7W;Nw@N%?H11=|*|^oP_PGQ+jbi*uWmdplZK*M(oDG1NYAnW^$C3*#U#R8EC111;%j z){b9wfWfSwU9cd8+EYtX?NOH__@ANt_vC&9jHD59^ta5HcKfjrSnqQLGmt#V2JD zZw4>oY|j-qhkf`q%5s{71yU&vEIy9CbB&N#o(%qf6Hhi%JOJ **Service States** | Displays the services (e.g. Prometheus, Jaeger, Influx, Log-Preloading, Agent Command Service, ...) and their current state (`enabled`/`disabled`).
In the future, we plan to implement the functionality to enable/disable the services in this view. | -| ![Status Table View](assets/logs-btn.png)
**Agent Logs** | Displays the logs of the service if agent commands and log preloading are enabled. | -| ![Status Table View](assets/config-btn.png)
**Current Config** | Displays the current config in `yaml` format when the agent commands are enabled. | -| ![Status Table View](assets/download-archive-btn.png)
**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. | \ No newline at end of file +| Button | Function | +|---------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ![Status Table View](assets/service-states-btn.png)
**Service States** | Displays the services (e.g. Prometheus, Jaeger, Influx, Log-Preloading, Agent Command Service, ...) and their current state (`enabled`/`disabled`).
In the future, we plan to implement the functionality to enable/disable the services in this view. | +| ![Status Table View](assets/logs-btn.png)
**Agent Logs** | Displays the logs of the service if agent commands and log preloading are enabled. | +| ![Status Table View](assets/config-btn.png)
**Current Config** | Displays the current config in `yaml` format when the agent commands are enabled. | +| ![Status Table View](assets/agent-health-icon.png)
**Agent State** | Displays the current agent state and the latest agent health incidents. | +| ![Status Table View](assets/download-archive-btn.png)
**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 index b6fdd01f4c..c9b1d32f87 100644 --- 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