CFY-4985-reporting-time-30s-instead-of-1s

cloudify-cosmo · Feb 28, 2016 · 5f1b573 · 5f1b573
1 parent 76990ac
commit 5f1b573
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 7 deletions.
diff --git a/aws-ec2-blueprint.yaml b/aws-ec2-blueprint.yaml
@@ -33,6 +33,16 @@ inputs:
     description: >
       User for connecting to agent VM's
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/cloudstack-blueprint.yaml b/cloudstack-blueprint.yaml
@@ -46,6 +46,16 @@ inputs:
       The name of the dedicated application network to be created.
     default: nodecellar_network
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/openstack-blueprint.yaml b/openstack-blueprint.yaml
@@ -33,6 +33,16 @@ inputs:
     description: >
       User for connecting to agent VM's
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/openstack-haproxy-blueprint.yaml b/openstack-haproxy-blueprint.yaml
@@ -34,6 +34,16 @@ inputs:
     description: >
       User for connecting to agent VM's
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/openstack-nova-net-blueprint.yaml b/openstack-nova-net-blueprint.yaml
@@ -34,6 +34,16 @@ inputs:
     description: >
       User for connecting to agent VM's
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/simple-blueprint.yaml b/simple-blueprint.yaml
@@ -33,6 +33,16 @@ inputs:
         Path to a private key that resided on the management machine.
         SSH-ing into agent machines will be done with this key.
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/softlayer-blueprint.yaml b/softlayer-blueprint.yaml
@@ -56,6 +56,16 @@ inputs:
       Ubuntu Linux 14.04 LTS Trusty Tahr - Minimal Install (64 bit)
     default: 4668
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/types/aws-ec2-types.yaml b/types/aws-ec2-types.yaml
@@ -30,7 +30,7 @@ node_types:
             inputs:
               diamond_config:
                 default:
-                  interval: 1
+                  interval: { get_input: diamond_reporting_interval }
           start: diamond.diamond_agent.tasks.start
           stop: diamond.diamond_agent.tasks.stop
           uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/types/cloudstack-types.yaml b/types/cloudstack-types.yaml
@@ -57,7 +57,7 @@ node_types:
           inputs:
             diamond_config:
               default:
-                interval: 1
+                interval: { get_input: diamond_reporting_interval }
         start: diamond.diamond_agent.tasks.start
         stop: diamond.diamond_agent.tasks.stop
         uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/types/openstack-types.yaml b/types/openstack-types.yaml
@@ -31,7 +31,7 @@ node_types:
             inputs:
               diamond_config:
                 default:
-                  interval: 1
+                  interval: { get_input: diamond_reporting_interval }
           start: diamond.diamond_agent.tasks.start
           stop: diamond.diamond_agent.tasks.stop
           uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/types/simple-types.yaml b/types/simple-types.yaml
@@ -18,7 +18,7 @@ node_types:
             inputs:
               diamond_config:
                 default:
-                  interval: 1
+                  interval: { get_input: diamond_reporting_interval }
           start: diamond.diamond_agent.tasks.start
           stop: diamond.diamond_agent.tasks.stop
           uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/types/softlayer-types.yaml b/types/softlayer-types.yaml
@@ -37,7 +37,7 @@ node_types:
             inputs:
               diamond_config:
                 default:
-                  interval: 1
+                  interval: { get_input: diamond_reporting_interval }
           start: diamond.diamond_agent.tasks.start
           stop: diamond.diamond_agent.tasks.stop
           uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/types/vcloud-types.yaml b/types/vcloud-types.yaml
@@ -36,7 +36,7 @@ node_types:
             inputs:
               diamond_config:
                 default:
-                  interval: 1
+                  interval: { get_input: diamond_reporting_interval }
           start: diamond.diamond_agent.tasks.start
           stop: diamond.diamond_agent.tasks.stop
           uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/types/vsphere-types.yaml b/types/vsphere-types.yaml
@@ -42,7 +42,7 @@ node_types:
           inputs:
             diamond_config:
               default:
-                interval: 1
+                interval: { get_input: diamond_reporting_interval }
         start: diamond.diamond_agent.tasks.start
         stop: diamond.diamond_agent.tasks.stop
         uninstall: diamond.diamond_agent.tasks.uninstall

diff --git a/vcloud-blueprint.yaml b/vcloud-blueprint.yaml
@@ -58,6 +58,16 @@ inputs:
       Name of the existing network that's being used for Cloudify management
     type: string
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
 node_templates:
 
   nodecellar:

diff --git a/vsphere-blueprint.yaml b/vsphere-blueprint.yaml
@@ -37,6 +37,17 @@ inputs:
     description: >
       Which network to deploy the VM on
 
+  diamond_reporting_interval:
+    description: interval in seconds for reporting metrics by diamond agent
+    type: integer
+    default: 10
+# This default is here for UX and demos, we strongly recommend you reconsider
+# how much data you report for your own production system based on your
+# specific application, as this generates approximately 12kb of data per report,
+# so for example a setting of 10 would generate approximately 726mb per week,
+# which might be an issue if you install your manager on a small partition.
+
+
 node_templates:
 
   nodecellar: