[04/10] brooklyn-docs git commit: Fix typo in example yaml for dynamicfabric
Fix typo in example yaml for dynamicfabric Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e8274fdd Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e8274fdd Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e8274fdd Branch: refs/heads/master Commit: e8274fddc603dadbba6cf7933d76eb6a0bfcdd4c Parents: c0aaf80 Author: Paul Campbell Authored: Fri Aug 24 12:51:56 2018 +0100 Committer: Paul Campbell Committed: Fri Aug 24 12:51:56 2018 +0100 -- guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e8274fdd/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml -- diff --git a/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml b/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml index 7a2a14f..4fef1f8 100644 --- a/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml +++ b/guide/blueprints/example_yaml/fabric-with-multiple-locations.yaml @@ -5,7 +5,7 @@ locations: services: - type: org.apache.brooklyn.entity.group.DynamicFabric brooklyn.config: -dynamiccfabric.memberspec: +dynamicfabric.memberspec: $brooklyn:entitySpec: type: org.apache.brooklyn.entity.group.DynamicCluster brooklyn.config:
brooklyn-docs git commit: Fix typo
Repository: brooklyn-docs Updated Branches: refs/heads/website a8d735c76 -> c4f7438f6 Fix typo Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c4f7438f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c4f7438f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c4f7438f Branch: refs/heads/website Commit: c4f7438f623e221d0e97b7b66d13d1db1af09aa9 Parents: a8d735c Author: Richard DownerAuthored: Tue Mar 13 09:20:27 2018 + Committer: Richard Downer Committed: Tue Mar 13 09:20:27 2018 + -- community/gsoc.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c4f7438f/community/gsoc.md -- diff --git a/community/gsoc.md b/community/gsoc.md index 99bb35c..7225f3e 100644 --- a/community/gsoc.md +++ b/community/gsoc.md @@ -15,7 +15,7 @@ for our project, or look at the [list of project ideas](http://s.apache.org/gsoc (note that this list is for *all* of the Foundation's projects, not just Brooklyn.) -Applications are **now open** and your final proprosal must be submitted to the +Applications are **now open** and your final proposal must be submitted to the Google Summer of Code website by **March 27th 2018, 16:00 UTC**. It will greatly benefit your application if you join our community, discuss your proposals and share your draft proposal with us before you submit your final application - see
[08/10] brooklyn-docs git commit: fix typo
fix typo Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/add9d81d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/add9d81d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/add9d81d Branch: refs/heads/master Commit: add9d81d78ed397c87a9f0d54e6a20397eabde41 Parents: 31eda46 Author: Alex HeneveldAuthored: Tue Nov 14 12:32:52 2017 + Committer: Alex Heneveld Committed: Tue Nov 14 12:32:52 2017 + -- guide/ops/upgrades/_blueprints.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/add9d81d/guide/ops/upgrades/_blueprints.md -- diff --git a/guide/ops/upgrades/_blueprints.md b/guide/ops/upgrades/_blueprints.md index f525c1d..2d4c6ca 100644 --- a/guide/ops/upgrades/_blueprints.md +++ b/guide/ops/upgrades/_blueprints.md @@ -20,7 +20,7 @@ To add these definitions, use the following headers in the bundle's OSGi `META-I * `Brooklyn-Catalog-Upgrade-For-Types` The most common patterns are to indicate that a bundle can replace all previous versions of itself -and all types thereing with types in the current bundle of the same name, using: +and all types therein with types in the current bundle of the same name, using: ``` Brooklyn-Catalog-Upgrade-For-Bundles: *
[1/2] brooklyn-docs git commit: Fix typo + syntax highlighting
Repository: brooklyn-docs Updated Branches: refs/heads/master 3772c2158 -> 9d9028de7 Fix typo + syntax highlighting Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2271b873 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2271b873 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2271b873 Branch: refs/heads/master Commit: 2271b873db9866867e399380bbff7f2aa902425b Parents: ba01df1 Author: Thomas BouronAuthored: Tue Nov 7 17:57:06 2017 + Committer: GitHub Committed: Tue Nov 7 17:57:06 2017 + -- .../_location-customizer-security-groups.md | 35 +++- 1 file changed, 19 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2271b873/guide/locations/_location-customizer-security-groups.md -- diff --git a/guide/locations/_location-customizer-security-groups.md b/guide/locations/_location-customizer-security-groups.md index bfca929..f795702 100644 --- a/guide/locations/_location-customizer-security-groups.md +++ b/guide/locations/_location-customizer-security-groups.md @@ -11,17 +11,18 @@ It is easy to add additional rules to the initial security group using `org.apac YAML Example: -name: ports @ AWS -location: jclouds:aws-ec2:us-west-2: -services: -- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess - brooklyn.config: -provisioning.properties: - customizers: - - $brooklyn:object: - type: org.apache.brooklyn.location.jclouds.networking.SharedLocationSecurityGroupCustomizer - object.fields: {tcpPortRanges: ["900-910", "915", "22"], udpPortRanges: ["100","200-300"], cidr: "82.40.153.101/24"} - +```yaml +name: ports @ AWS +location: jclouds:aws-ec2:us-west-2 +services: +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess + brooklyn.config: +provisioning.properties: + customizers: + - $brooklyn:object: + type: org.apache.brooklyn.location.jclouds.networking.SharedLocationSecurityGroupCustomizer + object.fields: {tcpPortRanges: ["900-910", "915", "22"], udpPortRanges: ["100","200-300"], cidr: "82.40.153.101/24"} +``` Make sure that you have rule which makes port 22 accessible from Apache Brooklyn. @@ -31,11 +32,13 @@ Apache Brooklyn exposes the SharedLocationSecurityGroupCustomizer functionality just by supplying `effector.add.openInboundPorts: true` "brooklyn.config". Example configuration in effector -location: jclouds:aws-ec2:us-west-2 -services: -- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess - brooklyn.config: -effector.add.openInboundPorts: true +```yaml +location: jclouds:aws-ec2:us-west-2 +services: +- type: org.apache.brooklyn.entity.software.base.EmptySoftwareProcess + brooklyn.config: +effector.add.openInboundPorts: true +``` ### Known limitations
[1/2] brooklyn-docs git commit: Fix typo
Repository: brooklyn-docs Updated Branches: refs/heads/master 53f96949e -> 4a2aeadb2 Fix typo Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/d65cfaff Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/d65cfaff Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/d65cfaff Branch: refs/heads/master Commit: d65cfaffbe2e5fd19035f372734f6a5f36ac454f Parents: 53f9694 Author: Duncan GrantAuthored: Wed Jul 13 21:00:10 2016 +0100 Committer: Duncan Grant Committed: Wed Jul 13 21:00:10 2016 +0100 -- guide/java/policies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/d65cfaff/guide/java/policies.md -- diff --git a/guide/java/policies.md b/guide/java/policies.md index 1c79e13..fe3dd6d 100644 --- a/guide/java/policies.md +++ b/guide/java/policies.md @@ -232,7 +232,7 @@ An Enricher which computes latency in accessing a URL. - org.apache.brooklyn.enricher.stock.Combiner -Can be used to combine the values of sensors. This enricher should be instantiated using Enrichers.buider.combineing(..). +Can be used to combine the values of sensors. This enricher should be instantiated using Enrichers.buider.combining(..). This enricher is only available in Java blueprints and cannot be used in YAML.
[4/5] brooklyn-docs git commit: fix typo
fix typo Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c8a69a83 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c8a69a83 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c8a69a83 Branch: refs/heads/master Commit: c8a69a839043facb6a2c298f25d4c8c9b024f65a Parents: 71f3f44 Author: Alex HeneveldAuthored: Mon Feb 8 17:03:02 2016 + Committer: Alex Heneveld Committed: Mon Feb 8 17:03:02 2016 + -- guide/yaml/advanced-example.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c8a69a83/guide/yaml/advanced-example.md -- diff --git a/guide/yaml/advanced-example.md b/guide/yaml/advanced-example.md index 326feb7..b66a3fb 100644 --- a/guide/yaml/advanced-example.md +++ b/guide/yaml/advanced-example.md @@ -1,5 +1,5 @@ --- -title: YAML BLueprint Advanced Example +title: YAML Blueprint Advanced Example layout: website-normal ---
[03/50] brooklyn-docs git commit: fix typo and improve syntax highlighting (including clipboard now) for logging.md
fix typo and improve syntax highlighting (including clipboard now) for logging.md Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/7416d00d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/7416d00d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/7416d00d Branch: refs/heads/0.6.0 Commit: 7416d00d136d107a07ee483fa99fd5790977c26d Parents: fe2ebf7 Author: Alex HeneveldAuthored: Thu Sep 19 21:34:44 2013 +0100 Committer: Alex Heneveld Committed: Thu Sep 19 21:34:44 2013 +0100 -- docs/dev/tips/logging.md | 21 + 1 file changed, 13 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/7416d00d/docs/dev/tips/logging.md -- diff --git a/docs/dev/tips/logging.md b/docs/dev/tips/logging.md index 595f919..02d82c3 100644 --- a/docs/dev/tips/logging.md +++ b/docs/dev/tips/logging.md @@ -44,13 +44,15 @@ For the most common customizations, simply create a ``logback-custom.xml`` on yo (ensuring it is loaded *before* brooklyn classes in classpath ordering in the pom) and supply your customizations there: - - - +{% highlight xml %} + + + - - - + + + +{% endhighlight %} For other configuration, you can override individual files listed above. For example: @@ -72,7 +74,10 @@ If you wish to supply your own ``logback.xml``, do **not** include ``brooklyn-lo You can set a specific logback config file to use with: --Dlogback.configurationFile=/path/to/config.xml +{% highlight bash %} +-Dlogback.configurationFile=/path/to/config.xml +{% endhighlight %} + ## Assemblies @@ -93,7 +98,7 @@ both in the IDE and in the assembly. ## Tests -Brooklyn projects ``test`` scope includes the ``brooklyn--utils-test-support`` project +Brooklyn projects ``test`` scope includes the ``brooklyn-utils-test-support`` project which supplies a ``logback-test.xml``. logback uses this file in preference to ``logback.xml`` when available (ie when running tests). However the ``logback-test.xml`` Brooklyn uses includes the same ``logback-main.xml`` call path above, so your configurations should still work.
[09/50] brooklyn-docs git commit: Fix typo in the simple-web-cluster docs
Fix typo in the simple-web-cluster docs Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/cebb6623 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/cebb6623 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/cebb6623 Branch: refs/heads/0.4.0 Commit: cebb6623b3d66a8d1ae8bc229695455425fd0bfb Parents: 71657f9 Author: Cosmin DumitracheAuthored: Wed May 30 17:09:37 2012 +0100 Committer: Cosmin Dumitrache Committed: Wed May 30 17:09:37 2012 +0100 -- docs/use/examples/webcluster/webcluster.include.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/cebb6623/docs/use/examples/webcluster/webcluster.include.md -- diff --git a/docs/use/examples/webcluster/webcluster.include.md b/docs/use/examples/webcluster/webcluster.include.md index 906a7e8..614f52c 100644 --- a/docs/use/examples/webcluster/webcluster.include.md +++ b/docs/use/examples/webcluster/webcluster.include.md @@ -41,7 +41,7 @@ this can also be deployed to your favourite cloud, let's pretend it's Amazon Ire {% highlight bash %} % cd $EXAMPLES_DIR/simple-web-cluster/brooklyn-example-simple-web-cluster -% ./web-server.sh aws-ecs:eu-west-1 +% ./web-server.sh aws-ec2:eu-west-1 {% endhighlight %}