add support for JVM monitoring

[releng/builder.git] / jjb / integration / integration-macros.yaml

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index c31de85f5b4b95ed983f4a67dd47d60053fc7cb2..c3e90c3cd3f6e532719ce0ec52d6d78247cde587 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -23,6 +23,7 @@
           controller-features: '{install-features}'
           controller-scope: '{controller-scope}'
           controller-use-features-boot: '{use-features-boot}'
+          feature-elasticsearch-attribute: '{elasticsearch-attribute}'
 
 - parameter:
     name: integration-controller-parameters
@@ -35,7 +36,9 @@
       - string:
           name: CONTROLLERFEATURES
           default: '{controller-features}'
-          description: 'Features to install in the controller separated by comma'
+          description: |
+              Features to install in the controller separated by comma
+              (note: extra features such as decanter are inserted in install scripts)
 
       - string:
           name: CONTROLLERDEBUGMAP
@@ -46,6 +49,16 @@
               The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
               (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
 
+      - string:
+          name: ELASTICSEARCHATTRIBUTE
+          default: '{feature-elasticsearch-attribute}'
+          description: |
+              Configure the period the script should harvest JVM metrics.
+              Default is short.
+              Possible values: long (its value is 120000)
+                               short (its value is 5000)
+                               any number between 5000 and 120000
+
       - string:
           name: USEFEATURESBOOT
           default: '{controller-use-features-boot}'