Skip to content

Commit 858e7f4

Browse files
authored
[7.x] [Monitoring] Add usage mapping for monitoring-kibana index (#40899) (#41601)
Backports the usage change to 7.x. A separate backport is needed to change the version for 6.7, which will complete this backport.
1 parent 22f3b53 commit 858e7f4

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/monitoring/exporter/MonitoringTemplateUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public final class MonitoringTemplateUtils {
2929
* <p>
3030
* It may be possible for this to diverge between templates and pipelines, but for now they're the same.
3131
*/
32-
public static final int LAST_UPDATED_VERSION = Version.V_7_0_0.id;
32+
public static final int LAST_UPDATED_VERSION = Version.V_7_0_1.id;
3333

3434
/**
3535
* Current version of templates used in their name to differentiate from breaking changes (separate from product version).

x-pack/plugin/core/src/main/resources/monitoring-alerts-7.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],
3-
"version": 7000099,
3+
"version": 7000199,
44
"settings": {
55
"index": {
66
"number_of_shards": 1,

x-pack/plugin/core/src/main/resources/monitoring-beats.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"index.number_of_replicas": 0,
1010
"index.number_of_shards": 1
1111
},
12-
"version": 7000099,
12+
"version": 7000199,
1313
"mappings": {
1414
"_doc": {
1515
"dynamic": false,

x-pack/plugin/core/src/main/resources/monitoring-es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ],
3-
"version": 7000099,
3+
"version": 7000199,
44
"settings": {
55
"index.number_of_shards": 1,
66
"index.number_of_replicas": 0,

x-pack/plugin/core/src/main/resources/monitoring-kibana.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ],
3-
"version": 7000099,
3+
"version": 7000199,
44
"settings": {
55
"index.number_of_shards": 1,
66
"index.number_of_replicas": 0,
@@ -50,6 +50,13 @@
5050
},
5151
"kibana_stats": {
5252
"properties": {
53+
"usage": {
54+
"properties": {
55+
"index": {
56+
"type": "keyword"
57+
}
58+
}
59+
},
5360
"kibana": {
5461
"properties": {
5562
"uuid": {

x-pack/plugin/core/src/main/resources/monitoring-logstash.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ],
3-
"version": 7000099,
3+
"version": 7000199,
44
"settings": {
55
"index.number_of_shards": 1,
66
"index.number_of_replicas": 0,

0 commit comments

Comments
 (0)