Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/remove graylog support #607

Merged
merged 3 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |

Expand Down
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'

Expand Down
61 changes: 0 additions & 61 deletions src/main/java/com/iexec/core/log/IexecGelfLogbackAppender.java

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
14 changes: 1 addition & 13 deletions src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,4 @@
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<logger name="org.springframework.web" level="${LOG_LEVEL}"/>

<!-- Graylog -->
<springProperty name="graylogHost" source="graylog.host"/>
<springProperty name="graylogPort" source="graylog.port"/>
<appender name="gelf" class="com.iexec.core.log.IexecGelfLogbackAppender">
<host>${graylogHost}</host>
<port>${graylogPort}</port>
</appender>

<root level="${LOG_LEVEL}">
<appender-ref ref="gelf"/>
</root>

</configuration>
</configuration>