diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2017-10-02 12:30:15 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2017-10-05 06:25:32 +0000 |
| commit | e69f8c07bf16acc8e59f2a5f836bfe7d03601553 (patch) | |
| tree | c54617490afcfc8507338679937d7a8dd2a2c742 /config-model | |
| parent | 14b32518dc6b04c791b6aca7adf873d31873de1c (diff) | |
revert admin.rnc changes
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 93807e985f0..26705784a34 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -13,8 +13,7 @@ AdminV2 = AdminSlobroks? & (LegacyAdminMonitoring | AdminMonitoring)? & (LegacyMetricConsumers | Metrics)? & - ClusterControllers? & - LogForwarding? + ClusterControllers? } AdminV3 = @@ -33,8 +32,7 @@ AdminV4 = AdminV4LogServers? & GenericConfig* & (LegacyAdminMonitoring | AdminMonitoring)? & - (LegacyMetricConsumers | Metrics)? & - LogForwarding? + (LegacyMetricConsumers | Metrics)? } AdminV4Slobroks = @@ -114,17 +112,3 @@ ClusterControllers = element cluster-controllers { service.attlist }+ } - -LogForwarding = element logforwarding { - element forward { - attribute type {xsd:string } & - element source { - element log { "access"| "vespa" }+ - } & - element destination { - element endpoint { xsd:string } & - element index { xsd:string } # TODO: Mandatory or with a default value? - } - }+ - -}
\ No newline at end of file |