diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2020-02-25 11:58:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 11:58:28 +0100 |
| commit | 891cdcd235bf7f53798b00d87bd579103bbe6867 (patch) | |
| tree | fdd4ceac1eaa998704b669949e4660738c680a44 | |
| parent | 3b70fbe1f3a0087b0faaa8908cc1cac31b805d40 (diff) | |
| parent | 76fc226a5ae37eb0211ee65a2455380749784004 (diff) | |
Merge pull request #12330 from vespa-engine/gjoranv/namespace-pattern
Allow all legal chars for cloudwatch namespace
| -rw-r--r-- | config-model/src/main/resources/schema/admin.rnc | 2 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/services.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/resources/schema/admin.rnc b/config-model/src/main/resources/schema/admin.rnc index 055f57dd7c0..e3ba7dc500d 100644 --- a/config-model/src/main/resources/schema/admin.rnc +++ b/config-model/src/main/resources/schema/admin.rnc @@ -89,7 +89,7 @@ Metrics = element metrics { Cloudwatch = element cloudwatch { attribute region { xsd:Name } & - attribute namespace { xsd:Name } & + attribute namespace { xsd:string { pattern = "[\w_\-/#:\.]+" } } & ( ( element access-key-name { xsd:Name } & diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index b06c93d6406..604e2abbbae 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -27,7 +27,7 @@ </consumer> <consumer id="cloudwatch-self-hosted-with-default-auth"> <metric-set id="public" /> - <cloudwatch region="us-east1" namespace="my-namespace" /> + <cloudwatch region="us-east1" namespace="namespace_legal.chars:/#1" /> </consumer> <consumer id="cloudwatch-self-hosted-with-profile"> <metric id="my-custom-metric" /> |