diff options
| author | gjoranv <gv@oath.com> | 2018-09-05 16:25:53 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:21 +0100 |
| commit | b3380fef0bd85b31c6d71bbf4e2ef633c074079d (patch) | |
| tree | 3d96c8527662c90afb4240d1101ca71dc343c604 /config-model/src/main/resources | |
| parent | 452678ef3262f788d58f2de596ca569dee1b8680 (diff) | |
Remove support for deprecated 'metric-consumers' in 'admin'.
Diffstat (limited to 'config-model/src/main/resources')
| -rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 37cd6476399..c30a856d942 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -11,7 +11,7 @@ AdminV2 = FileDistribution? & AdminSlobroks? & (LegacyAdminMonitoring | AdminMonitoring)? & - (LegacyMetricConsumers | Metrics)? & + Metrics? & ClusterControllers? & LogForwarding? } @@ -30,7 +30,7 @@ AdminV4 = AdminV4LogServers? & GenericConfig* & (LegacyAdminMonitoring | AdminMonitoring)? & - (LegacyMetricConsumers | Metrics)? & + Metrics? & LogForwarding? } @@ -94,17 +94,6 @@ Metrics = element metrics { }+ } -# TODO: Remove on Vespa 7 -LegacyMetricConsumers = element metric-consumers { - element consumer { - attribute name { xsd:string { pattern = "[a-zA-Z][_a-zA-Z0-9]*" } }& - element metric { - attribute name{xsd:Name} & - attribute output-name{xsd:Name}? - }+ - }+ -} - ClusterControllers = element cluster-controllers { attribute standalone-zookeeper { xsd:string }? & element cluster-controller { |