diff options
Diffstat (limited to 'config-model/src/main/resources/schema')
7 files changed, 7 insertions, 73 deletions
diff --git a/config-model/src/main/resources/schema/.gitignore b/config-model/src/main/resources/schema/.gitignore index b60c856f91a..e8bf39e2289 100644 --- a/config-model/src/main/resources/schema/.gitignore +++ b/config-model/src/main/resources/schema/.gitignore @@ -1,2 +1,2 @@ -*.rng *.xsd +*.rng 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 { diff --git a/config-model/src/main/resources/schema/clients-v2.rnc b/config-model/src/main/resources/schema/clients-v2.rnc index 1076d332dd5..5e50135edee 100644 --- a/config-model/src/main/resources/schema/clients-v2.rnc +++ b/config-model/src/main/resources/schema/clients-v2.rnc @@ -1,8 +1,7 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. Clients20 = attribute version { "2.0" } & - LoadTypes? & - Spoolers20? + LoadTypes? LoadTypes = element load-types { element type { @@ -11,38 +10,6 @@ LoadTypes = element load-types { }* } -Spoolers20 = element spoolers { - attribute jvmargs { text }? & - SpoolMaster20* & - FeederOptions20? & - Spooler20+ -} - -Spooler20 = element spooler { - service.attlist? & - attribute id { xsd:string }? & - attribute directory { xsd:string }? & - attribute keepsuccess { xsd:boolean }? & - attribute maxfailuresize { xsd:integer }? & - attribute maxfatalfailuresize { xsd:integer }? & - attribute threads { xsd:integer }? & - attribute maxretries { xsd:integer }? & - FeederOptionsOpts20? & - element parsers { - element parser { - attribute type { text } & - element parameter { - attribute key { xsd:string { minLength = "1" } } & - attribute value { xsd:string { minLength = "1" } } - }* - }+ - }? -} - -SpoolMaster20 = element spoolmaster { - service.attlist? -} - FeederOptions20 = element feederoptions { FeederOptionsOpts20 & DocProcChain? diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index 5dbcffce736..a30f61809ad 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -24,7 +24,6 @@ ContainerServices = Client* & Server* & Http? & - HttpFilter? & AccessLog* & SecretStore? & GenericConfig* @@ -73,8 +72,7 @@ AccessLog = element accesslog { attribute compressOnRotation { xsd:boolean }? & attribute symlinkName { string }? & - attribute rotationInterval { string }? & - attribute rotationScheme { string "date" | string "sequence" }? + attribute rotationInterval { string }? } SecretStore = element secret-store { diff --git a/config-model/src/main/resources/schema/content.rnc b/config-model/src/main/resources/schema/content.rnc index c0313cd50ef..ae2af6618d7 100644 --- a/config-model/src/main/resources/schema/content.rnc +++ b/config-model/src/main/resources/schema/content.rnc @@ -302,7 +302,6 @@ Tuning = element tuning { element maxage { xsd:nonNegativeInteger }? }? & element transactionlog { - element maxentries { xsd:nonNegativeInteger }? & element maxsize { xsd:nonNegativeInteger }? }? & element conservative { @@ -336,16 +335,13 @@ Tuning = element tuning { element maxsize { xsd:nonNegativeInteger }? & element maxsize-percent { xsd:double { minInclusive = "0.0" maxInclusive = "50.0" } }? & element initialentries { xsd:nonNegativeInteger }? & - element maxentries { xsd:nonNegativeInteger }? & TuningCompression? }? & element logstore { element maxfilesize { xsd:nonNegativeInteger }? & - element maxdiskbloatfactor { xsd:double { minInclusive = "0.0" } }? & element minfilesizefactor { xsd:double { minInclusive = "0.10" maxInclusive = "1.0" } }? & element chunk { element maxsize { xsd:nonNegativeInteger }? & - element maxentries { xsd:nonNegativeInteger }? & TuningCompression? }? }? diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 4fc34862365..b2c3dcf7b5a 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -12,7 +12,6 @@ start = element deployment { Notifications? & Test? & Staging? & - BlockUpgrade* & Prod* } @@ -28,12 +27,6 @@ BlockChange = element block-change { attribute time-zone { xsd:string }? } -BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7 - attribute days { xsd:string } & - attribute hours { xsd:string } & - attribute time-zone { xsd:string }? -} - Notifications = element notifications { attribute when { xsd:string }? & Email* diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index c4eb7435ca6..fe728506124 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -11,7 +11,6 @@ include "legacygenericcluster.rnc" start = element services { attribute version { "1.0" }? & - attribute major-version { text }? & # TODO: Remove on Vespa 7 attribute application-type { "hosted-infrastructure" }? & LegacyGenericCluster* & GenericCluster* & |