diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-07-05 12:41:36 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-07-05 12:41:36 +0200 |
commit | 15dbc5a5636e10bc8a183630ed9400911e69e14a (patch) | |
tree | 89c7d3b41372d616f686642df8287e75f811b909 /config-model/src/main/resources/schema/admin.rnc | |
parent | e76e9cefe8f65a1061b09400b733b5fe9fc5c42b (diff) |
Don't use unnecessary specific naming
Diffstat (limited to 'config-model/src/main/resources/schema/admin.rnc')
-rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index e2f15fc51e4..f475a05b979 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -11,7 +11,7 @@ AdminV2 = (ConfigServer | ConfigServers)? & FileDistribution? & AdminSlobroks? & - AdminYamas? & + (LegacyAdminMonitoring | AdminMonitoring)? & (LegacyMetricConsumers | Metrics)? & ClusterControllers? } @@ -29,7 +29,7 @@ AdminV4 = element minSlobroksPerCluster { xsd:positiveInteger }? & AdminV4Slobroks? & AdminV4LogServers? & - AdminYamas? & + (LegacyAdminMonitoring | AdminMonitoring)? & (LegacyMetricConsumers | Metrics)? } @@ -51,14 +51,14 @@ AdminSlobroks = }+ } -AdminYmon = - element ymon { - attribute endpoint { xsd:anyURI { minLength = "1" } }?, - attribute clustername { xsd:NCName }?, - attribute interval { xsd:int }? +AdminMonitoring = + element monitoring { + attribute interval { xsd:int }?, + attribute systemname { xsd:string }? } -AdminYamas = +# TODO: Alternative name for the 'monitoring' tag. Remove on Vespa 7 +LegacyAdminMonitoring = element yamas { attribute interval { xsd:int }?, attribute systemname { xsd:string }? @@ -90,6 +90,7 @@ 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]*" } }& |