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

Implement logs retriever pagination using new Elasticsearch Java client #315

Merged
Show file tree
Hide file tree
Changes from 5 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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ private/
agent.jar
local.pid

.env


21 changes: 11 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,18 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!--
<dependency>
<!--
<!- -
conflict between io.opentelemetry:opentelemetry-sdk-extension-aws and io.jenkins.configuration-as-code:test-harness
-->
- ->
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.13.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
-->
<dependency>
<!-- okhttp:4.9.3 -> okio:2.8.0 versus okhttp:4.9.3 -> okio:2.8.0 - kotlin-stdlib-->
<groupId>org.jetbrains.kotlin</groupId>
Expand Down Expand Up @@ -229,6 +231,10 @@
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jackson2-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
Expand Down Expand Up @@ -341,16 +347,11 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<groupId>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
<version>${elasticstack.version}</version>
<exclusions>
<exclusion>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import hudson.security.ACL;
import hudson.util.FormValidation;
import hudson.util.ListBoxModel;
import io.jenkins.plugins.opentelemetry.backend.elastic.ElasticsearchLogStorageRetriever;
import io.jenkins.plugins.opentelemetry.backend.elastic.ElasticsearchLogStorageScrollingRetriever;
import io.jenkins.plugins.opentelemetry.job.log.LogStorageRetriever;
import jenkins.model.Jenkins;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -150,7 +150,7 @@ public String getMetricsVisualizationUrlTemplate() {
@Override
public LogStorageRetriever getLogStorageRetriever() {
if (StringUtils.isNotBlank(this.elasticsearchUrl)) {
return new ElasticsearchLogStorageRetriever(this.elasticsearchUrl, ElasticsearchLogStorageRetriever.getCredentials(this.elasticsearchCredentialsId), indexPattern);
return new ElasticsearchLogStorageScrollingRetriever(this.elasticsearchUrl, ElasticsearchLogStorageScrollingRetriever.getCredentials(this.elasticsearchCredentialsId), indexPattern);
} else {
return null;
}
Expand Down Expand Up @@ -309,7 +309,7 @@ public FormValidation doCheckElasticsearchCredentialsId(Item context, @QueryPara
}

try {
ElasticsearchLogStorageRetriever.getCredentials(elasticsearchCredentialsId);
ElasticsearchLogStorageScrollingRetriever.getCredentials(elasticsearchCredentialsId);
} catch (NoSuchElementException e) {
return FormValidation.warning("The credentials are not valid.");
}
Expand All @@ -333,7 +333,10 @@ public FormValidation doValidate(@QueryParameter String credentialsId, @QueryPar
}

try {
ElasticsearchLogStorageRetriever elasticsearchLogStorageRetriever = new ElasticsearchLogStorageRetriever(elasticsearchUrl, ElasticsearchLogStorageRetriever.getCredentials(credentialsId), indexPattern);
ElasticsearchLogStorageScrollingRetriever elasticsearchLogStorageRetriever = new ElasticsearchLogStorageScrollingRetriever(
elasticsearchUrl,
ElasticsearchLogStorageScrollingRetriever.getCredentials(credentialsId),
indexPattern);

if (elasticsearchLogStorageRetriever.indexExists()) {
return FormValidation.ok("success");
Expand Down

This file was deleted.

Loading