diff --git a/CHANGELOG.md b/CHANGELOG.md index d3ea6cb05..7a913359f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ All notable changes to this project will be documented in this file. ### Bug Fixes - Clean call to `iexecHubService#getTaskDescriptionFromChain` in test. (#597) - Reject deal if TEE tag but trust not in {0,1}. (#598) +### Quality +- Remove `Graylog` support. Fetch logs with a sidecar to push them to your log infrastructure. (#607) +### Dependency Upgrades +- Remove `logstash-gelf` dependency. (#607) ## [[8.1.2]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.1.2) 2023-06-29 diff --git a/README.md b/README.md index 3ad00429f..c7351b353 100644 --- a/README.md +++ b/README.md @@ -49,8 +49,6 @@ You can configure the _iExec Core Scheduler_ with the following properties: | `IEXEC_RESULT_REPOSITORY_HOST` | _iExec Result Proxy_ server host. | String | `localhost` | | `IEXEC_RESULT_REPOSITORY_PORT` | _iExec Result Proxy_ server port. | Positive integer | `13200` | | `IEXEC_CORE_MANAGEMENT_ACTUATORS` | Endpoint IDs that should be included or `*` for all. | String | `health, info` | -| `IEXEC_CORE_GRAYLOG_HOST` | _Graylog_ server host. | String | `localhost` | -| `IEXEC_CORE_GRAYLOG_PORT` | _Graylog_ server port. | Positive integer | `12201` | | `IEXEC_LOGS_PURGE_RATE_IN_DAYS` | Interval in days between 2 executions of the purge mechanism. | Positive integer | `1` | | `IEXEC_LOGS_AVAILABILITY_PERIOD_IN_DAYS` | Number of days to keep logs of past tasks. | Positive integer | `3` | diff --git a/build.gradle b/build.gradle index 2c6e56c22..5488eef85 100644 --- a/build.gradle +++ b/build.gradle @@ -52,9 +52,7 @@ dependencies { implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion" // spring - implementation ("org.springframework.boot:spring-boot-starter") { - exclude group: 'org.springframework.boot', module: 'spring-boot-starter-logging' //required for Graylog - } + implementation "org.springframework.boot:spring-boot-starter" implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-aop" implementation "org.springframework.boot:spring-boot-starter-data-mongodb" @@ -88,9 +86,6 @@ dependencies { // ipfs implementation "com.github.ipfs:java-ipfs-http-client:1.2.3" - // graylog - implementation 'biz.paluch.logging:logstash-gelf:1.5.1' - // observability runtimeOnly 'io.micrometer:micrometer-registry-prometheus' diff --git a/src/main/java/com/iexec/core/log/IexecGelfLogbackAppender.java b/src/main/java/com/iexec/core/log/IexecGelfLogbackAppender.java deleted file mode 100644 index 6c2ca3b31..000000000 --- a/src/main/java/com/iexec/core/log/IexecGelfLogbackAppender.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2020 IEXEC BLOCKCHAIN TECH - * - * Licensed 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. - */ - -package com.iexec.core.log; - -import biz.paluch.logging.gelf.logback.GelfLogbackAppender; -import ch.qos.logback.classic.spi.ILoggingEvent; -import com.iexec.core.chain.CredentialsService; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.lang.NonNull; -import org.springframework.stereotype.Component; - -@Component -public class IexecGelfLogbackAppender extends GelfLogbackAppender implements ApplicationContextAware { - - private static String address; - - public IexecGelfLogbackAppender() { - super(); - } - - /* - * Graylog note: The `originHost` will only contain what we want after CredentialService is loaded. - * - * Very first logs will have: - * originHost=user@user.com - * Next logs will have: - * originHost=0x12..34 - * - * */ - @Override - protected void append(ILoggingEvent event) { - if (address != null) { - gelfMessageAssembler.setOriginHost(address); - } - super.append(event); - } - - @Override - public void setApplicationContext(@NonNull ApplicationContext applicationContext) throws BeansException { - CredentialsService credentialsService = (CredentialsService) applicationContext - .getAutowireCapableBeanFactory().getBean("credentialsService"); - address = credentialsService.getCredentials().getAddress(); - } -} - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9f34e6f97..b79db966b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -84,10 +84,6 @@ management: health: show-details: always # Show all details of HealthIndicators -graylog: - host: ${IEXEC_CORE_GRAYLOG_HOST:localhost} - port: ${IEXEC_CORE_GRAYLOG_PORT:12201} - logs: purge-rate-in-days: ${IEXEC_LOGS_PURGE_RATE_IN_DAYS:1} availability-period-in-days: ${IEXEC_LOGS_AVAILABILITY_PERIOD_IN_DAYS:3} diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 9df7f02e9..277ab1110 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -22,16 +22,4 @@ - - - - - ${graylogHost} - ${graylogPort} - - - - - - - \ No newline at end of file +