You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/29 15:14:01 UTC
[2/3] brooklyn-docs git commit: Use flag name where it's simpler
Use flag name where it's simpler
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/d0fa7b86
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/d0fa7b86
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/d0fa7b86
Branch: refs/heads/master
Commit: d0fa7b86d7602367b607882a6e782163f674fe08
Parents: e7b87ec
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Mon May 15 12:39:57 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Mon May 15 12:39:57 2017 +0100
----------------------------------------------------------------------
guide/blueprints/chef/advanced-chef-integration.md | 10 +++++-----
guide/blueprints/chef/example_yaml/mysql-chef-1.yaml | 8 ++++----
guide/blueprints/chef/example_yaml/mysql-chef-2.yaml | 8 ++++----
guide/blueprints/example_yaml/appserver-w-policy.yaml | 10 +++++-----
.../blueprints/example_yaml/enricher-aggregator.yaml | 2 +-
.../blueprints/example_yaml/enricher-propagator.yaml | 2 +-
.../test-app-with-enrichers-slightly-simpler.yaml | 8 ++++----
guide/blueprints/policies.md | 12 ++++++------
guide/ops/gui/_my-web-cluster2.yaml | 14 +++++++-------
guide/start/_my-web-cluster2.yaml | 14 +++++++-------
guide/start/example_yaml/mycluster.yaml | 14 +++++++-------
guide/start/policies.md | 14 +++++++-------
12 files changed, 58 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/chef/advanced-chef-integration.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/chef/advanced-chef-integration.md b/guide/blueprints/chef/advanced-chef-integration.md
index 5c28e0d..1081cd3 100644
--- a/guide/blueprints/chef/advanced-chef-integration.md
+++ b/guide/blueprints/chef/advanced-chef-integration.md
@@ -33,13 +33,13 @@ A general schema for the supported YAML is below:
{% highlight yaml %}
- type: chef:cookbook_name
brooklyn.config:
- brooklyn.chef.cookbooksUrls:
+ cookbook_urls:
cookbook_name: url://for/cookbook.tgz
dependency1: url://for/dependency1.tgz
- brooklyn.chef.runList: [ "cookbook_name::start" ]
- brooklyn.chef.launch.attributes: # map of arguments to set in the chef node
- brooklyn.chef.lifecycle.serviceName: cookbook_service
- brooklyn.chef.lifecycle.pidFile: /var/run/cookbook.pid
+ launch_run_list: [ "cookbook_name::start" ]
+ launch_attributes: # map of arguments to set in the chef node
+ service_name: cookbook_service
+ pid_file: /var/run/cookbook.pid
{% endhighlight %}
If you are interested in exploring the Java code for creating blueprints,
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml b/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
index 94b521f..d1c244f 100644
--- a/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
+++ b/guide/blueprints/chef/example_yaml/mysql-chef-1.yaml
@@ -3,14 +3,14 @@ services:
- type: chef:mysql
brooklyn.config:
- brooklyn.chef.cookbooksUrls:
+ cookbook_urls:
# only needed for chef solo; URL can be local to brooklyn, or github, etc...
mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
- brooklyn.chef.runList: [ "mysql::server" ]
- brooklyn.chef.launch.attributes:
+ launch_run_list: [ "mysql::server" ]
+ launch_attributes:
mysql:
# these attrs are required by the mysql cookbook under node['mysql']
server_root_password: p4ssw0rd
@@ -22,4 +22,4 @@ services:
# (supported options are `service_name` and `pid_file`; normally you should just pick one.
# here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
#service_name: mysqld
- brooklyn.chef.lifecycle.pidFile: /var/run/mysqld/mysqld.pid
+ pid_file: /var/run/mysqld/mysqld.pid
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml b/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
index 10d1628..756f374 100644
--- a/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
+++ b/guide/blueprints/chef/example_yaml/mysql-chef-2.yaml
@@ -4,14 +4,14 @@ services:
id: db
brooklyn.config:
- brooklyn.chef.cookbooksUrls:
+ cookbook_urls:
# only needed for chef solo; URL can be local to brooklyn, or github, etc...
mysql: https://github.com/opscode-cookbooks/mysql/archive/v4.0.12.tar.gz
openssl: https://github.com/opscode-cookbooks/openssl/archive/v1.1.0.tar.gz
build-essential: https://github.com/opscode-cookbooks/build-essential/archive/v1.4.4.tar.gz
- brooklyn.chef.runList: [ "mysql::server" ]
- brooklyn.chef.launch.attributes:
+ launch_run_list: [ "mysql::server" ]
+ launch_attributes:
mysql:
# these attrs are required by the mysql cookbook under node['mysql']
server_root_password: $brooklyn:entity("db").config("mysql.password")
@@ -23,5 +23,5 @@ services:
# (supported options are `service_name` and `pid_file`; normally you should just pick one.
# here we use the pid_file because the service_name varies, mysql on centos, mysqld on ubuntu!)
#service_name: mysqld
- brooklyn.chef.lifecycle.pidFile: /var/run/mysqld/mysqld.pid
+ pid_file: /var/run/mysqld/mysqld.pid
mysql.password: p4ssw0rd
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/example_yaml/appserver-w-policy.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/appserver-w-policy.yaml b/guide/blueprints/example_yaml/appserver-w-policy.yaml
index dc13dad..4b10f59 100644
--- a/guide/blueprints/example_yaml/appserver-w-policy.yaml
+++ b/guide/blueprints/example_yaml/appserver-w-policy.yaml
@@ -15,11 +15,11 @@ services:
brooklyn.policies:
- type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
brooklyn.config:
- autoscaler.metric: $brooklyn:sensor("brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode")
- autoscaler.metricLowerBound: 10
- autoscaler.metricUpperBound: 100
- autoscaler.minPoolSize: 1
- autoscaler.maxPoolSize: 5
+ metric: $brooklyn:sensor("brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode")
+ metricLowerBound: 10
+ metricUpperBound: 100
+ minPoolSize: 1
+ maxPoolSize: 5
- type: org.apache.brooklyn.entity.database.mysql.MySqlNode
id: db
name: DB HelloWorld Visitors
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/example_yaml/enricher-aggregator.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-aggregator.yaml b/guide/blueprints/example_yaml/enricher-aggregator.yaml
index 0538bb1..af78c28 100644
--- a/guide/blueprints/example_yaml/enricher-aggregator.yaml
+++ b/guide/blueprints/example_yaml/enricher-aggregator.yaml
@@ -4,4 +4,4 @@ brooklyn.enrichers:
enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
enricher.aggregating.fromMembers: true
- enricher.transformation.untyped: average
\ No newline at end of file
+ transformation: average
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/example_yaml/enricher-propagator.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/enricher-propagator.yaml b/guide/blueprints/example_yaml/enricher-propagator.yaml
index 4ef1f4f..88c3f6e 100644
--- a/guide/blueprints/example_yaml/enricher-propagator.yaml
+++ b/guide/blueprints/example_yaml/enricher-propagator.yaml
@@ -4,5 +4,5 @@ brooklyn.enrichers:
enricher.producer: $brooklyn:entity("cluster")
- type: org.apache.brooklyn.enricher.stock.Propagator
brooklyn.config:
- enricher.propagating.sensorMapping:
+ sensorMapping:
$brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
----------------------------------------------------------------------
diff --git a/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml b/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
index f73578e..f1bc25e 100644
--- a/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
+++ b/guide/blueprints/example_yaml/test-app-with-enrichers-slightly-simpler.yaml
@@ -26,7 +26,7 @@ services:
# from which to take sensors; in that mode you can specify `propagate` as a list of sensors whose names are unchanged,
# instead of (or in addition to) this map
brooklyn.config:
- enricher.propagating.sensorMapping:
+ sensorMapping:
$brooklyn:sensor("url"): $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
brooklyn.enrichers:
- type: org.apache.brooklyn.enricher.stock.Aggregator
@@ -40,7 +40,7 @@ services:
brooklyn.config:
enricher.sourceSensor: $brooklyn:sensor("urls.list")
enricher.targetSensor: $brooklyn:sensor("urls.list.comma_separated.max_2")
- enricher.joiner.maximum: 2
+ maximum: 2
# TODO infer uniqueTag, name etc
uniqueTag: urls.list.comma_separated.max_2
- type: org.apache.brooklyn.enricher.stock.Joiner
@@ -48,8 +48,8 @@ services:
brooklyn.config:
enricher.sourceSensor: $brooklyn:sensor("urls.list")
enricher.targetSensor: $brooklyn:sensor("org.apache.brooklyn.core.entity.Attributes", "main.uri")
- enricher.joiner.quote: false
- enricher.joiner.maximum: 1
+ quote: false
+ maximum: 1
brooklyn.enrichers:
- type: org.apache.brooklyn.enricher.stock.Propagator
# if nothing specified for `propagating` or `sensorMapping` then
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/blueprints/policies.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/policies.md b/guide/blueprints/policies.md
index 98cd873..e5f7dde 100644
--- a/guide/blueprints/policies.md
+++ b/guide/blueprints/policies.md
@@ -44,12 +44,12 @@ e.g. if the average request per second across a cluster of Tomcat servers goes o
brooklyn.policies:
- type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
brooklyn.config:
- autoscaler.metric: webapp.reqs.perSec.perNode
- autoscaler.metricUpperBound: 3
- autoscaler.metricLowerBound: 1
- autoscaler.resizeUpStabilizationDelay: 2s
- autoscaler.resizeDownStabilizationDelay: 1m
- autoscaler.maxPoolSize: 3
+ metric: webapp.reqs.perSec.perNode
+ metricUpperBound: 3
+ metricLowerBound: 1
+ resizeUpStabilizationDelay: 2s
+ resizeDownStabilizationDelay: 1m
+ maxPoolSize: 3
{% endhighlight %}
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/ops/gui/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/ops/gui/_my-web-cluster2.yaml b/guide/ops/gui/_my-web-cluster2.yaml
index b20d21a..86a5978 100644
--- a/guide/ops/gui/_my-web-cluster2.yaml
+++ b/guide/ops/gui/_my-web-cluster2.yaml
@@ -16,13 +16,13 @@ services:
brooklyn.policies:
- type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
brooklyn.config:
- autoscaler.metric: webapp.reqs.perSec.windowed.perNode
- autoscaler.metricLowerBound: 0.1
- autoscaler.metricUpperBound: 10
- autoscaler.minPoolSize: 1
- autoscaler.maxPoolSize: 4
- autoscaler.resizeUpStabilizationDelay: 10s
- autoscaler.resizeDownStabilizationDelay: 1m
+ metric: webapp.reqs.perSec.windowed.perNode
+ metricLowerBound: 0.1
+ metricUpperBound: 10
+ minPoolSize: 1
+ maxPoolSize: 4
+ resizeUpStabilizationDelay: 10s
+ resizeDownStabilizationDelay: 1m
- type: org.apache.brooklyn.entity.database.mysql.MySqlNode
id: db
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/start/_my-web-cluster2.yaml
----------------------------------------------------------------------
diff --git a/guide/start/_my-web-cluster2.yaml b/guide/start/_my-web-cluster2.yaml
index b20d21a..86a5978 100644
--- a/guide/start/_my-web-cluster2.yaml
+++ b/guide/start/_my-web-cluster2.yaml
@@ -16,13 +16,13 @@ services:
brooklyn.policies:
- type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
brooklyn.config:
- autoscaler.metric: webapp.reqs.perSec.windowed.perNode
- autoscaler.metricLowerBound: 0.1
- autoscaler.metricUpperBound: 10
- autoscaler.minPoolSize: 1
- autoscaler.maxPoolSize: 4
- autoscaler.resizeUpStabilizationDelay: 10s
- autoscaler.resizeDownStabilizationDelay: 1m
+ metric: webapp.reqs.perSec.windowed.perNode
+ metricLowerBound: 0.1
+ metricUpperBound: 10
+ minPoolSize: 1
+ maxPoolSize: 4
+ resizeUpStabilizationDelay: 10s
+ resizeDownStabilizationDelay: 1m
- type: org.apache.brooklyn.entity.database.mysql.MySqlNode
id: db
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/start/example_yaml/mycluster.yaml
----------------------------------------------------------------------
diff --git a/guide/start/example_yaml/mycluster.yaml b/guide/start/example_yaml/mycluster.yaml
index f2c0359..35641be 100644
--- a/guide/start/example_yaml/mycluster.yaml
+++ b/guide/start/example_yaml/mycluster.yaml
@@ -37,12 +37,12 @@ services:
- type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
brooklyn.config:
- autoscaler.metric: webapp.reqs.perSec.perNode
- autoscaler.metricUpperBound: 3
- autoscaler.metricLowerBound: 1
- autoscaler.resizeUpStabilizationDelay: 2s
- autoscaler.resizeDownStabilizationDelay: 1m
- autoscaler.maxPoolSize: 3
+ metric: webapp.reqs.perSec.perNode
+ metricUpperBound: 3
+ metricLowerBound: 1
+ resizeUpStabilizationDelay: 2s
+ resizeDownStabilizationDelay: 1m
+ maxPoolSize: 3
brooklyn.enrichers:
- type: org.apache.brooklyn.enricher.stock.Aggregator
@@ -50,7 +50,7 @@ services:
enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
enricher.aggregating.fromMembers: true
- enricher.transformation.untyped: average
+ transformation: average
- type: org.apache.brooklyn.entity.proxy.nginx.NginxController
name: Load Balancer (nginx)
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d0fa7b86/guide/start/policies.md
----------------------------------------------------------------------
diff --git a/guide/start/policies.md b/guide/start/policies.md
index 4f33697..f26b4e5 100644
--- a/guide/start/policies.md
+++ b/guide/start/policies.md
@@ -57,12 +57,12 @@ services:
- type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy
brooklyn.config:
- autoscaler.metric: webapp.reqs.perSec.perNode
- autoscaler.metricUpperBound: 3
- autoscaler.metricLowerBound: 1
- autoscaler.resizeUpStabilizationDelay: 2s
- autoscaler.resizeDownStabilizationDelay: 1m
- autoscaler.maxPoolSize: 3
+ metric: webapp.reqs.perSec.perNode
+ metricUpperBound: 3
+ metricLowerBound: 1
+ resizeUpStabilizationDelay: 2s
+ resizeDownStabilizationDelay: 1m
+ maxPoolSize: 3
brooklyn.enrichers:
- type: org.apache.brooklyn.enricher.stock.Aggregator
@@ -70,7 +70,7 @@ services:
enricher.sourceSensor: $brooklyn:sensor("webapp.reqs.perSec.windowed")
enricher.targetSensor: $brooklyn:sensor("webapp.reqs.perSec.perNode")
enricher.aggregating.fromMembers: true
- enricher.transformation.untyped: average
+ transformation: average
- type: org.apache.brooklyn.entity.proxy.nginx.NginxController
name: Load Balancer (nginx)