diff options
Diffstat (limited to 'config-model/src/main/resources/schema/admin.rnc')
| -rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 37cd6476399..3729f3ab57c 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -10,8 +10,8 @@ AdminV2 = (ConfigServer | ConfigServers)? & FileDistribution? & AdminSlobroks? & - (LegacyAdminMonitoring | AdminMonitoring)? & - (LegacyMetricConsumers | Metrics)? & + AdminMonitoring? & + Metrics? & ClusterControllers? & LogForwarding? } @@ -29,8 +29,8 @@ AdminV4 = AdminV4Slobroks? & AdminV4LogServers? & GenericConfig* & - (LegacyAdminMonitoring | AdminMonitoring)? & - (LegacyMetricConsumers | Metrics)? & + AdminMonitoring? & + Metrics? & LogForwarding? } @@ -58,14 +58,6 @@ AdminMonitoring = attribute systemname { xsd:string }? } -# TODO: Alternative name for the 'monitoring' tag. Remove on Vespa 7 -LegacyAdminMonitoring = - element yamas { - attribute interval { xsd:int }?, - attribute systemname { xsd:string }? - } - - ConfigServer = element configserver { service.attlist } @@ -94,17 +86,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 { |