Skip to content

Commit 0396027

Browse files
carsonipcarsonip
authored
Add missing apm-server tail sampling monitoring metrics to stack monitoring mapping (#121543) (#121579)
Add missing apm-server tail sampling monitoring metrics to stack monitoring mapping. They were missed in #110568. (cherry picked from commit f3f5135) # Conflicts: # x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java
1 parent ad192c5 commit 0396027

File tree

3 files changed

+127
-1
lines changed

3 files changed

+127
-1
lines changed

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,45 @@
786786
},
787787
"sampling": {
788788
"properties": {
789+
"tail": {
790+
"properties": {
791+
"dynamic_service_groups": {
792+
"type": "long"
793+
},
794+
"events": {
795+
"properties": {
796+
"dropped": {
797+
"type": "long"
798+
},
799+
"failed_writes": {
800+
"type": "long"
801+
},
802+
"head_unsampled": {
803+
"type": "long"
804+
},
805+
"processed": {
806+
"type": "long"
807+
},
808+
"sampled": {
809+
"type": "long"
810+
},
811+
"stored": {
812+
"type": "long"
813+
}
814+
}
815+
},
816+
"storage": {
817+
"properties": {
818+
"lsm_size": {
819+
"type": "long"
820+
},
821+
"value_log_size": {
822+
"type": "long"
823+
}
824+
}
825+
}
826+
}
827+
},
789828
"transactions_dropped": {
790829
"type": "long"
791830
}
@@ -2219,6 +2258,54 @@
22192258
},
22202259
"sampling": {
22212260
"properties": {
2261+
"tail": {
2262+
"properties": {
2263+
"dynamic_service_groups": {
2264+
"type": "alias",
2265+
"path": "beat.stats.apm_server.sampling.tail.dynamic_service_groups"
2266+
},
2267+
"events": {
2268+
"properties": {
2269+
"dropped": {
2270+
"type": "alias",
2271+
"path": "beat.stats.apm_server.sampling.tail.events.dropped"
2272+
},
2273+
"failed_writes": {
2274+
"type": "alias",
2275+
"path": "beat.stats.apm_server.sampling.tail.events.failed_writes"
2276+
},
2277+
"head_unsampled": {
2278+
"type": "alias",
2279+
"path": "beat.stats.apm_server.sampling.tail.events.head_unsampled"
2280+
},
2281+
"processed": {
2282+
"type": "alias",
2283+
"path": "beat.stats.apm_server.sampling.tail.events.processed"
2284+
},
2285+
"sampled": {
2286+
"type": "alias",
2287+
"path": "beat.stats.apm_server.sampling.tail.events.sampled"
2288+
},
2289+
"stored": {
2290+
"type": "alias",
2291+
"path": "beat.stats.apm_server.sampling.tail.events.stored"
2292+
}
2293+
}
2294+
},
2295+
"storage": {
2296+
"properties": {
2297+
"lsm_size": {
2298+
"type": "alias",
2299+
"path": "beat.stats.apm_server.sampling.tail.storage.lsm_size"
2300+
},
2301+
"value_log_size": {
2302+
"type": "alias",
2303+
"path": "beat.stats.apm_server.sampling.tail.storage.value_log_size"
2304+
}
2305+
}
2306+
}
2307+
}
2308+
},
22222309
"transactions_dropped": {
22232310
"type": "alias",
22242311
"path": "beat.stats.apm_server.sampling.transactions_dropped"

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -966,6 +966,45 @@
966966
},
967967
"sampling": {
968968
"properties": {
969+
"tail": {
970+
"properties": {
971+
"dynamic_service_groups": {
972+
"type": "long"
973+
},
974+
"events": {
975+
"properties": {
976+
"dropped": {
977+
"type": "long"
978+
},
979+
"failed_writes": {
980+
"type": "long"
981+
},
982+
"head_unsampled": {
983+
"type": "long"
984+
},
985+
"processed": {
986+
"type": "long"
987+
},
988+
"sampled": {
989+
"type": "long"
990+
},
991+
"stored": {
992+
"type": "long"
993+
}
994+
}
995+
},
996+
"storage": {
997+
"properties": {
998+
"lsm_size": {
999+
"type": "long"
1000+
},
1001+
"value_log_size": {
1002+
"type": "long"
1003+
}
1004+
}
1005+
}
1006+
}
1007+
},
9691008
"transactions_dropped": {
9701009
"type": "long"
9711010
}

‎x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/MonitoringTemplateRegistry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class MonitoringTemplateRegistry extends IndexTemplateRegistry {
7777
* writes monitoring data in ECS format as of 8.0. These templates define the ECS schema as well as alias fields for the old monitoring
7878
* mappings that point to the corresponding ECS fields.
7979
*/
80-
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 18;
80+
public static final int STACK_MONITORING_REGISTRY_VERSION = 8_00_00_99 + 21;
8181
private static final String STACK_MONITORING_REGISTRY_VERSION_VARIABLE = "xpack.stack.monitoring.template.release.version";
8282
private static final String STACK_TEMPLATE_VERSION = "8";
8383
private static final String STACK_TEMPLATE_VERSION_VARIABLE = "xpack.stack.monitoring.template.version";

0 commit comments

Comments
 (0)