Skip to content

Commit bc9a609

Browse files
nhuttranlukas-vlcek
nhuttran
authored andcommittedMay 10, 2023
Fix review comments for indices filter feature
Signed-off-by: nhuttran <truong.nhut_tran.ext@nokia.com>
1 parent 06ce0ac commit bc9a609

File tree

5 files changed

+489
-70
lines changed

5 files changed

+489
-70
lines changed
 

‎README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,13 @@ prometheus.nodes.filter: "_all"
141141

142142
#### Indices filter
143143

144-
Prometheus exporter can be configured to filter indices statistics with indices starting with prefixes.
144+
Prometheus exporter can be configured to filter indices statistics from selected indices.
145+
To target all indices, use '' or * or _all
145146
Default value: `""`.
146147

147-
For example to filter indices statistics with indices starting with prefixes such as logs, alarms:
148+
For example to filter indices statistics:
148149
```
149-
prometheus.indices_filter: "logs-*,alarms*"
150+
prometheus.indices_filter: "log-*,*log,*log*,log*-test"
150151
```
151152

152153
## Usage

‎build.gradle

+30-32
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,8 @@ import org.opensearch.gradle.test.RestIntegTestTask
33
import java.util.regex.Matcher
44
import java.util.regex.Pattern
55

6-
apply plugin: 'java'
7-
apply plugin: 'idea'
8-
apply plugin: 'opensearch.opensearchplugin'
9-
apply plugin: 'opensearch.yaml-rest-test'
10-
11-
def pluginName = pluginName
12-
def pluginDescription = pluginDescription
13-
//def projectPath = 'org.opensearch'
14-
//def pathToPlugin = 'path.to.plugin'
15-
def pluginClassName = pluginClassname
16-
17-
opensearchplugin {
18-
name pluginName
19-
description pluginDescription
20-
// classname "${projectPath}.${pathToPlugin}.${pluginClassName}"
21-
classname pluginClassName
22-
licenseFile rootProject.file('LICENSE.txt')
23-
noticeFile rootProject.file('NOTICE.txt')
24-
}
25-
26-
// thirdparty audit needs can be enabled
27-
thirdPartyAudit.enabled = false
28-
29-
// This requires an additional Jar not published as part of build-tools
30-
loggerUsageCheck.enabled = false
31-
32-
// No need to validate pom, as we do not upload to maven/sonatype
33-
validateNebulaPom.enabled = false
34-
356
buildscript {
36-
377
ext {
38-
398
// Four {digit(s)} concatenated with a "." followed by -rc{digit(s)}
409
// Examples: 1.0.0.1-rc2, 2.10.4.0-rc5
4110
// Group (3) refers to the last .{digit{(s)} pattern (this is what we want to remove for OpS version)
@@ -49,7 +18,6 @@ buildscript {
4918
String opensearch_version
5019
String plugin_version = version
5120

52-
5321
Matcher rc_matcher = RC_pattern.matcher(plugin_version)
5422
Matcher other_matcher = OTHER_pattern.matcher(plugin_version)
5523

@@ -83,6 +51,36 @@ buildscript {
8351
}
8452
}
8553

54+
apply plugin: 'java'
55+
apply plugin: 'idea'
56+
apply plugin: 'opensearch.opensearchplugin'
57+
apply plugin: 'opensearch.yaml-rest-test'
58+
//apply plugin: 'checkstyle'
59+
60+
def pluginName = pluginName
61+
def pluginDescription = pluginDescription
62+
//def projectPath = 'org.opensearch'
63+
//def pathToPlugin = 'path.to.plugin'
64+
def pluginClassName = pluginClassname
65+
66+
opensearchplugin {
67+
name pluginName
68+
description pluginDescription
69+
// classname "${projectPath}.${pathToPlugin}.${pluginClassName}"
70+
classname pluginClassName
71+
licenseFile rootProject.file('LICENSE.txt')
72+
noticeFile rootProject.file('NOTICE.txt')
73+
}
74+
75+
// thirdparty audit needs can be enabled
76+
thirdPartyAudit.enabled = false
77+
78+
// This requires an additional Jar not published as part of build-tools
79+
loggerUsageCheck.enabled = false
80+
81+
// No need to validate pom, as we do not upload to maven/sonatype
82+
validateNebulaPom.enabled = false
83+
8684
repositories {
8785
mavenLocal()
8886
maven { url "https://aws.oss.sonatype.org/content/repositories/releases" }

0 commit comments

Comments
 (0)