honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
Chris Earle 2019-04-26 16:44:03 -04:00 committed by GitHub
parent 22f3b53ed7
commit 858e7f4a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ public final class MonitoringTemplateUtils {
* <p> * <p>
* It may be possible for this to diverge between templates and pipelines, but for now they're the same. * It may be possible for this to diverge between templates and pipelines, but for now they're the same.
*/ */
public static final int LAST_UPDATED_VERSION = Version.V_7_0_0.id; public static final int LAST_UPDATED_VERSION = Version.V_7_0_1.id;
/** /**
* Current version of templates used in their name to differentiate from breaking changes (separate from product version). * Current version of templates used in their name to differentiate from breaking changes (separate from product version).

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

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ], "index_patterns": [ ".monitoring-alerts-${monitoring.template.version}" ],
"version": 7000099, "version": 7000199,
"settings": { "settings": {
"index": { "index": {
"number_of_shards": 1, "number_of_shards": 1,

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

@ -9,7 +9,7 @@
"index.number_of_replicas": 0, "index.number_of_replicas": 0,
"index.number_of_shards": 1 "index.number_of_shards": 1
}, },
"version": 7000099, "version": 7000199,
"mappings": { "mappings": {
"_doc": { "_doc": {
"dynamic": false, "dynamic": false,

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

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ], "index_patterns": [ ".monitoring-es-${monitoring.template.version}-*" ],
"version": 7000099, "version": 7000199,
"settings": { "settings": {
"index.number_of_shards": 1, "index.number_of_shards": 1,
"index.number_of_replicas": 0, "index.number_of_replicas": 0,

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

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ], "index_patterns": [ ".monitoring-kibana-${monitoring.template.version}-*" ],
"version": 7000099, "version": 7000199,
"settings": { "settings": {
"index.number_of_shards": 1, "index.number_of_shards": 1,
"index.number_of_replicas": 0, "index.number_of_replicas": 0,
@ -50,6 +50,13 @@
}, },
"kibana_stats": { "kibana_stats": {
"properties": { "properties": {
"usage": {
"properties": {
"index": {
"type": "keyword"
}
}
},
"kibana": { "kibana": {
"properties": { "properties": {
"uuid": { "uuid": {

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

@ -1,6 +1,6 @@
{ {
"index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ], "index_patterns": [ ".monitoring-logstash-${monitoring.template.version}-*" ],
"version": 7000099, "version": 7000199,
"settings": { "settings": {
"index.number_of_shards": 1, "index.number_of_shards": 1,
"index.number_of_replicas": 0, "index.number_of_replicas": 0,