siennathesane · July 1, 2019 21:22
diff --git a/upstream.diff b/upstream.diff
 diff --git cloud.gov/.final_builds/jobs/archiver_syslog/index.yml cloudfoundry-community/.final_builds/jobs/archiver_syslog/index.yml
 index 0ddcdd7..1de12aa 100644
 --- cloud.gov/.final_builds/jobs/archiver_syslog/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/archiver_syslog/index.yml
 @@ -1,4 +1,12 @@
 builds:
 +  024340d8d44f7c2c67a5037ceaec88ab99d7f6848a138419774d243e01480f90:
 +    version: 024340d8d44f7c2c67a5037ceaec88ab99d7f6848a138419774d243e01480f90
 +    blobstore_id: c1726afc-09a5-4df7-715a-f0aae6130f11
 +    sha1: sha256:08f57c00a283e586c642668163206aaf7d4f5741e0f8b49c4e1aa4a4f28ad820
 +  38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46:
 +    version: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +    blobstore_id: 580e9a93-7a2d-4198-493b-a0daa4c6e8a6
 +    sha1: sha256:74f071b3951c632fc2e07238b4ffcf163b99595a1f4db793de26a47c3d8804b8
   7be4bc5de13d22f2a64825dddf7616f444a530c2:
     version: 7be4bc5de13d22f2a64825dddf7616f444a530c2
     blobstore_id: cb5c88bd-1899-44c3-45a4-2a9142fd0ea3
 diff --git cloud.gov/.final_builds/jobs/cerebro/index.yml cloudfoundry-community/.final_builds/jobs/cerebro/index.yml
 index 222ec5b..5c6cb5b 100644
 --- cloud.gov/.final_builds/jobs/cerebro/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/cerebro/index.yml
 @@ -1,4 +1,8 @@
 builds:
 +  105153f93461caf5827e5a48a597004834d988057a54a15c61ed813e60f317d8:
 +    version: 105153f93461caf5827e5a48a597004834d988057a54a15c61ed813e60f317d8
 +    blobstore_id: 35ba0c0c-14fb-4254-588c-dc3d7b05cdb6
 +    sha1: sha256:ca3c33951df7e3aea974d168cdf0d9d9ae4dee41602c91a085d7fe415038f7dd
   1668c9d6e4930d05bacaee0eefc2b6b30d6fbeb4:
     version: 1668c9d6e4930d05bacaee0eefc2b6b30d6fbeb4
     blobstore_id: 8ad86c39-30c9-47e5-794d-3df676c1cc74
 @@ -11,4 +15,12 @@ builds:
     version: 8ef6199301a7ce88a6c5b02a4b4b7857f62a7b79
     blobstore_id: 9303703c-33fe-40fc-adc2-df6c3ed5f88c
     sha1: 9e87ca3136092e18968c65932ab3ddae0c3cb1cd
 +  d0a842a752ddc5691064fdee755186bc8b97a224:
 +    version: d0a842a752ddc5691064fdee755186bc8b97a224
 +    blobstore_id: 23555ac6-9ab6-4751-66ee-15298e60cbcd
 +    sha1: 972f11794cf5330a6f099f7efc5aa745df12eb9b
 +  f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243:
 +    version: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +    blobstore_id: 653d72b6-e392-44fd-6c61-d9b00dd95dd6
 +    sha1: sha256:f15419f3612f9d953a76c92ed5444481a0f04434883b6ee418c3bfe7bffded87
 format-version: "2"
 diff --git cloud.gov/.final_builds/jobs/curator/index.yml cloudfoundry-community/.final_builds/jobs/curator/index.yml
 index 247454d..932c381 100644
 --- cloud.gov/.final_builds/jobs/curator/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/curator/index.yml
 @@ -15,10 +15,18 @@ builds:
     version: b29bd590f9f3d9be54bd478587ba81c93bd5ffcd
     blobstore_id: 95ed00fa-595a-49c5-9d74-5f64359da5f6
     sha1: fc6666255a20f1331d17530d7eda498f258b3c78
 +  be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f:
 +    version: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +    blobstore_id: e4912026-772b-4381-4006-00dc7e2bacef
 +    sha1: sha256:42217dcd0401babe75ea7f19c5b9ac8b6f2cdb73bad7209f65a4798c940488cd
   d2ff7a23edc6a143195f194262ee47e282111f8d:
     version: d2ff7a23edc6a143195f194262ee47e282111f8d
     blobstore_id: 33dd0412-2018-46b2-82d1-7d6197607e97
     sha1: 4d7913ef778efba5064293fbd7f420ccb3f8d2e5
 +  ecc6aada82ec9912d439b85c75d5d7c326301564:
 +    version: ecc6aada82ec9912d439b85c75d5d7c326301564
 +    blobstore_id: 0e90ebe1-3193-4055-6461-a62330eefa27
 +    sha1: 67c7261b56881283f4c8e27f3da9c00da3153a16
   f6da579aeeaf3eb93314ea089e7dbd9e6eba2096:
     version: f6da579aeeaf3eb93314ea089e7dbd9e6eba2096
     blobstore_id: 716fe65a-a115-44f1-8fb6-539fd7b6d221
 diff --git cloud.gov/.final_builds/jobs/elasticsearch/index.yml cloudfoundry-community/.final_builds/jobs/elasticsearch/index.yml
 index a55eef7..a8656b2 100644
 --- cloud.gov/.final_builds/jobs/elasticsearch/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/elasticsearch/index.yml
 @@ -3,10 +3,22 @@ builds:
     version: "4"
     blobstore_id: b1acb1de-ba00-439e-a4ac-7216b71ff256
     sha1: 770a41d0c22b32fec5c2ec9666874d335fb6e06e
 +  0311f8180a6fbdf6545beb999f33bdb8a37277c8:
 +    version: 0311f8180a6fbdf6545beb999f33bdb8a37277c8
 +    blobstore_id: 482d06e0-98af-43e1-589b-1ddbe6916c8f
 +    sha1: f11d2c6f0c8ce9d67062dae0ae2fd67a6a5e4e6c
 +  05ee8554d6faf12abc09bc52249d927d7f08f15c902c03fa406394608d62c5fc:
 +    version: 05ee8554d6faf12abc09bc52249d927d7f08f15c902c03fa406394608d62c5fc
 +    blobstore_id: 6e978f83-4918-497a-4573-ed46bd394388
 +    sha1: sha256:920f4f868a4ced332567faea78ce9503e4a8cb9aa6c1b544fb28fab228b0a97b
   0fea792c26d50b570c8e708eeaddfded6a4cd600:
     version: "5"
     blobstore_id: 9b9c3320-31e0-4c0a-80f1-6803ef29fbb3
     sha1: f2f0dce2f96b25828084561e46256da7f9e3decb
 +  22f3a077cc072d43c2817f6408dc6bd3bcd6494f64c61e8f8794c4619936035c:
 +    version: 22f3a077cc072d43c2817f6408dc6bd3bcd6494f64c61e8f8794c4619936035c
 +    blobstore_id: bf90d7b6-2baa-486b-762e-dbcc8a61fb74
 +    sha1: sha256:97ea27c92808fc4ed75cd36d67daf8b67f2fdc8c9a43521c246f44e060fc8d39
   2d06bba725fff75bf83dab249b18d41d377e6158:
     version: 2d06bba725fff75bf83dab249b18d41d377e6158
     blobstore_id: bdae29b9-172e-4c18-976f-de71e2acf690
 @@ -31,6 +43,10 @@ builds:
     version: 5ccdaab72a4d7577b4f1022fb322038491832121
     blobstore_id: 2cc17ea6-308f-460e-a700-f9340bba0154
     sha1: b05efe683d39fe0efe4633d95ee5adc2990fd7ab
 +  5cea3d8bc20c2cd83df83e03fa2310ba51870edd24efa193662827b6e785b035:
 +    version: 5cea3d8bc20c2cd83df83e03fa2310ba51870edd24efa193662827b6e785b035
 +    blobstore_id: 017fb570-146b-4607-599a-ad6b524b6bef
 +    sha1: sha256:de85ab178856b18ba79ec7d53c9931b30870cd51fdcd00644d41e96054ff5e09
   6450a2982c90abcc3ed5b447bbf181843cedb93a:
     version: "1"
     blobstore_id: 9ae35067-a290-4803-a0b3-d5257c1a94bc
 @@ -67,6 +83,10 @@ builds:
     version: a8fc2bd8000576201f234924e3dd296e4f2b79a6
     blobstore_id: 2dd48874-1040-4eb5-8ced-1f2c5a38b8fb
     sha1: cf79c236412a630d87d83242fa8409e50a9f0051
 +  aa6a07abae57c35ae8ae6ac45ec363150cf6fa46a4d609eae2d6c953e67b4250:
 +    version: aa6a07abae57c35ae8ae6ac45ec363150cf6fa46a4d609eae2d6c953e67b4250
 +    blobstore_id: a5fc286b-70c6-4cd5-6577-0bcc19234400
 +    sha1: sha256:8ce91834280fc3e61e0d837f04da7becfb93bb209a5c35f05755144c1dded4a4
   aab64e5cdd256fe1eeffdfe4d7073efb54a18766:
     version: "2"
     blobstore_id: 8117dfb1-e010-4e29-ae06-3bd3d535f5f5
 diff --git cloud.gov/.final_builds/jobs/elasticsearch_config/index.yml cloudfoundry-community/.final_builds/jobs/elasticsearch_config/index.yml
 index 19cc772..b05dc97 100644
 --- cloud.gov/.final_builds/jobs/elasticsearch_config/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/elasticsearch_config/index.yml
 @@ -11,6 +11,10 @@ builds:
     version: 176e2725e700846611cfef4d4e2a2cc23153f510
     blobstore_id: 2b2da91f-b14a-4ef0-bbbe-934a5353d86b
     sha1: d7bc31575ffcac4a086a924b13e81d416b3ecee1
 +  20b64d95e1968966271dad9b0c8d554d864ab18c1ce94fd47e5e91519eb81d3b:
 +    version: 20b64d95e1968966271dad9b0c8d554d864ab18c1ce94fd47e5e91519eb81d3b
 +    blobstore_id: 0f5a20ce-2de1-4ba4-4947-7683ec11e8d0
 +    sha1: sha256:3119b80760c4dbaa782ff1cba476292466db6066a51858d1acc391a08a710d83
   258f9938eeb25dda28b0312332bf2a2f456791b8:
     version: 258f9938eeb25dda28b0312332bf2a2f456791b8
     blobstore_id: e145b56e-b4d5-42b6-b3ce-8462587a33e9
 @@ -31,4 +35,8 @@ builds:
     version: b1cdc7940894ce9cca52ec06bacefdaab3e99239
     blobstore_id: 3567e998-75c7-4a45-5b91-4a59f485d97d
     sha1: b37b65868250c18e2f6fa8b8ee88bae57a603df9
 +  c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23:
 +    version: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +    blobstore_id: 4400a0d3-f267-4e9f-5dce-2877493b1ff2
 +    sha1: sha256:ccfd7ed91fe9ba819415050c48a0770bc8fb95095bf0657def72eaa830515d48
 format-version: "2"
 diff --git cloud.gov/.final_builds/jobs/haproxy/index.yml cloudfoundry-community/.final_builds/jobs/haproxy/index.yml
 index a8a0c7d..b4600ab 100644
 --- cloud.gov/.final_builds/jobs/haproxy/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/haproxy/index.yml
 @@ -43,4 +43,8 @@ builds:
     version: ee70ed0512982452b080f0747c89f4b9eaafdf37
     blobstore_id: 66c53f46-4a17-46ba-9038-b24680b4472f
     sha1: d4931608b4e3608d202ff4414fc7c5679698162c
 +  ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88:
 +    version: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +    blobstore_id: 240a7ebd-67e7-4bc3-7536-fabbcf31cdbd
 +    sha1: sha256:e2ebdd5e0d32bed501062489eb231f08fee0ab3d02793ac1d8841ea47c073305
 format-version: "2"
 diff --git cloud.gov/.final_builds/jobs/ingestor_syslog/index.yml cloudfoundry-community/.final_builds/jobs/ingestor_syslog/index.yml
 index a63543a..4121885 100644
 --- cloud.gov/.final_builds/jobs/ingestor_syslog/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/ingestor_syslog/index.yml
 @@ -3,6 +3,10 @@ builds:
     version: 08722e9f45132d351be7e6c78c7067b28bd890bc
     blobstore_id: ea1ac25c-dbbb-4c2f-8bb1-9501d0f04ec2
     sha1: fc1185f562658cea525d972ed02a84e44baa235b
 +  22302014f8ffb7544945457431c32b6bc605a69cefd0e6682796f9ecb2785f36:
 +    version: 22302014f8ffb7544945457431c32b6bc605a69cefd0e6682796f9ecb2785f36
 +    blobstore_id: 3e29b24b-2fcc-416d-694c-a90bfe1b7152
 +    sha1: sha256:682ab44206485e59924047308cd951a0f5374832aed750b258d95acf345b0209
   265a834815316a926763dcedaea0feb818f4b7e6:
     version: 265a834815316a926763dcedaea0feb818f4b7e6
     blobstore_id: 66fa57ff-3f75-4892-9e29-9bd5278e728c
 @@ -15,6 +19,10 @@ builds:
     version: "3"
     blobstore_id: 7697383e-2759-461c-ab35-1e9d379b7f8c
     sha1: ac3f876ca9562a3f0eb681876c3727513aa48d5e
 +  3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83:
 +    version: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +    blobstore_id: 9d80205b-c535-4364-5fa7-9b6c16f5b249
 +    sha1: sha256:56606e563c2d43425de5977a73ac8d7db5284261819fb4d2fcb08e42bedcbdf6
   53383f860a4f2475141e2f908f34ff0c0625e05d:
     version: 53383f860a4f2475141e2f908f34ff0c0625e05d
     blobstore_id: f0c3e49c-983c-4298-b7ef-74d62023e3fe
 @@ -47,6 +55,10 @@ builds:
     version: 9bc652f83923dd42e96312b7486ad1f62225fc7a
     blobstore_id: edf480ed-f783-4228-8280-2e0388900d5b
     sha1: 1ea9753029f8dc2cd4be10897a5761c89cd62033
 +  9ddb0a6c179e9a654c23a44008ffe7d43c14eb0d:
 +    version: 9ddb0a6c179e9a654c23a44008ffe7d43c14eb0d
 +    blobstore_id: 732d9871-df12-4010-5dad-ad99d786ea0d
 +    sha1: 96a621776cbca721c8119418570612ccb0b4e57a
   a7f3c20ed0a44e5501ee61692ef7735a7eb62162:
     version: a7f3c20ed0a44e5501ee61692ef7735a7eb62162
     blobstore_id: 74d0b770-acdf-4b1f-83ec-08fe6a25c003
 diff --git cloud.gov/.final_builds/jobs/kibana/index.yml cloudfoundry-community/.final_builds/jobs/kibana/index.yml
 index cf09ef4..17a717a 100644
 --- cloud.gov/.final_builds/jobs/kibana/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/kibana/index.yml
 @@ -7,6 +7,10 @@ builds:
     version: 2c92bf9539d1898f5ff673cf6e2675ec1aaffafd
     blobstore_id: 53601f4f-1752-4600-8e63-549b3da42131
     sha1: dfafe1ac6a2df5554b83bf580869637ecce846cc
 +  5250c0382c4df573a5c920d6f762d3a8f0bbab38d6f25c0f534e29bb5f9026eb:
 +    version: 5250c0382c4df573a5c920d6f762d3a8f0bbab38d6f25c0f534e29bb5f9026eb
 +    blobstore_id: 03e136ca-69d3-4e4d-6740-9685af4f1fb1
 +    sha1: sha256:47d10fe7ec28a8074ecc194376c245b2232f379bf0c9fa6c279f495d84f92e42
   5eb15ecbb204f13a6066eb1ba9043ae781f86193:
     version: 5eb15ecbb204f13a6066eb1ba9043ae781f86193
     blobstore_id: a6aadaf9-5856-4429-b1e0-b64aad83cbf6
 @@ -19,6 +23,10 @@ builds:
     version: 6cd7365e80cf4401935827f8b78cfc8c9bbf3685
     blobstore_id: d61f3c42-8de5-4dec-a0bf-85a8ed750381
     sha1: ce192333e1512acd60adc5cfb461c0f5c8840bab
 +  7a54425f9973f06e823b19ac3c0ce0eb568df3d8:
 +    version: 7a54425f9973f06e823b19ac3c0ce0eb568df3d8
 +    blobstore_id: 925b3ed2-b65a-41b9-54d2-93c842691601
 +    sha1: a69c3d45eb7fd85aef469dfbeec957aef1e1014a
   8269a5c13b75621ee4a88f3db3dcbee0778e205f:
     version: 8269a5c13b75621ee4a88f3db3dcbee0778e205f
     blobstore_id: 960c6ab1-0369-4fa4-9d6f-4cd85af3e683
 @@ -39,6 +47,14 @@ builds:
     version: c014e15f1bf277983db354b42c58e1ea4cf46667
     blobstore_id: 52a20b73-1f6e-4e3f-a721-cba041a8e6a6
     sha1: 2d12c5ddb6fc1b3d2084d76c1c8c2741188ac954
 +  c57f27985bed8a7dfcda3a7abf173bdb263e5c82ddcdc99c34721f8970358287:
 +    version: c57f27985bed8a7dfcda3a7abf173bdb263e5c82ddcdc99c34721f8970358287
 +    blobstore_id: 8b90a735-09a0-4a79-5b24-b4e8138a4433
 +    sha1: sha256:a40f8f7ff6c3c9d153ed008f0deaf152aa84e1ccfaedb1c48891af967e867573
 +  ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b:
 +    version: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +    blobstore_id: bd117263-d419-4afa-4a41-cb66a18c2c24
 +    sha1: sha256:7d3a39cecf50be2403b376919248fcfcb05a08a791611244ece17052ba98a589
   d79103ea094abd8a0001ba7b37427a7831467290:
     version: d79103ea094abd8a0001ba7b37427a7831467290
     blobstore_id: 8cd0784a-eed7-4495-958f-b4aed2e2983f
 diff --git cloud.gov/.final_builds/jobs/nats_to_syslog/index.yml cloudfoundry-community/.final_builds/jobs/nats_to_syslog/index.yml
 index 068f372..d2a1d6e 100644
 --- cloud.gov/.final_builds/jobs/nats_to_syslog/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/nats_to_syslog/index.yml
 @@ -1,4 +1,8 @@
 builds:
 +  55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72:
 +    version: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +    blobstore_id: 40e6dddd-2ab5-45c7-5ea3-0c6feb1fdd5a
 +    sha1: sha256:2c6c6c3772b3128ff6686bb1be1c9b923cce8a37db412afc1fd02c7904ca63dc
   75f4656891779ba7c8ac10bad4e168d359c76fa1:
     version: 75f4656891779ba7c8ac10bad4e168d359c76fa1
     blobstore_id: 43d83c15-1e25-4907-aca8-14989474e89c
 diff --git cloud.gov/.final_builds/jobs/smoke_tests/index.yml cloudfoundry-community/.final_builds/jobs/smoke_tests/index.yml
 index dc22978..ef526c0 100644
 --- cloud.gov/.final_builds/jobs/smoke_tests/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/smoke_tests/index.yml
 @@ -3,4 +3,8 @@ builds:
     version: 1e599855bff6b972027e55fc0e660c278c0e4407
     blobstore_id: e37ecfd3-a0ed-4a1b-64ca-4e01768cc96d
     sha1: d89b4ea3caabb251885ebd36332b5292e3a11f01
 +  5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504:
 +    version: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +    blobstore_id: 2a2cc9d2-1cd8-4a74-6d29-c2f176d3c93a
 +    sha1: sha256:50875f48794db321df42a4c35ac4ae190c283cf44f77112c94f75b6a89b82f0f
 format-version: "2"
 diff --git cloud.gov/.final_builds/jobs/syslog_forwarder/index.yml cloudfoundry-community/.final_builds/jobs/syslog_forwarder/index.yml
 index 984972a..5fbac93 100644
 --- cloud.gov/.final_builds/jobs/syslog_forwarder/index.yml
 +++ cloudfoundry-community/.final_builds/jobs/syslog_forwarder/index.yml
 @@ -11,4 +11,8 @@ builds:
     version: accee924b3444827ad0665d8326bdca4762b9e6e
     blobstore_id: a69688ea-c31c-479d-a5c3-cba678ad1fc2
     sha1: 85ecb1d85b9ea041b62ab9fdf96cf8fdcb2de0ca
 +  d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711:
 +    version: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +    blobstore_id: 7d398c2d-7b0c-4060-55e4-375d9089d823
 +    sha1: sha256:698a75d760d571038cd0d111e57eee9d6ab662f8ef7ef1d5a32bc2544f7f0c74
 format-version: "2"
 diff --git cloud.gov/.final_builds/license/index.yml cloudfoundry-community/.final_builds/license/index.yml
 index bce2b91..682dd39 100644
 --- cloud.gov/.final_builds/license/index.yml
 +++ cloudfoundry-community/.final_builds/license/index.yml
 @@ -1,11 +1,14 @@
 ----
 builds:
   45ba225fe5790e0633fb9a8e20be9efeea888f51:
     version: 45ba225fe5790e0633fb9a8e20be9efeea888f51
 -    sha1: 065103911af70b44df428eee52b3400417adb630
     blobstore_id: a26529b4-1b4b-4504-a0bb-7bb7d45ce3c2
 +    sha1: 065103911af70b44df428eee52b3400417adb630
   7990cd67c49dc9a4fd1cda168bb5352eca5ca67b:
     version: 7990cd67c49dc9a4fd1cda168bb5352eca5ca67b
 -    sha1: 3710bdde30fe4fdcf117578abf4e3cfd4924709f
     blobstore_id: 5433675d-b542-43ac-b005-834e660f6d1d
 -format-version: '2'
 +    sha1: 3710bdde30fe4fdcf117578abf4e3cfd4924709f
 +  8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779:
 +    version: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +    blobstore_id: dd450a37-4927-4919-4cea-ddffa6d086eb
 +    sha1: sha256:dec582b855538894e263d430fe548182687082ecc17a9275a003e88fdeb3a2f6
 +format-version: "2"
 diff --git cloud.gov/.final_builds/packages/cerebro/index.yml cloudfoundry-community/.final_builds/packages/cerebro/index.yml
 index bfe028c..7bab80f 100644
 --- cloud.gov/.final_builds/packages/cerebro/index.yml
 +++ cloudfoundry-community/.final_builds/packages/cerebro/index.yml
 @@ -1,13 +1,18 @@
 ----
 builds:
   278996853981243e3b921d18e255d55d998dcc7f:
     version: 278996853981243e3b921d18e255d55d998dcc7f
 -    sha1: e3f29042027c466333df66a555a2088d99d06e26
     blobstore_id: 56de0bba-8c94-4939-9d34-d6a76ae7711b
 -  !binary "ODdkYjNkMDNlMWFjOWQ4YzZjZWZmYjRkMmM2Y2NjNTQxZWNkOGQ0OQ==":
 -    version: !binary |-
 -      ODdkYjNkMDNlMWFjOWQ4YzZjZWZmYjRkMmM2Y2NjNTQxZWNkOGQ0OQ==
 -    sha1: !binary |-
 -      MWQwNzhiZTRjODVlZGY3ZTBiOWNjOWQ5OGU4NzY2MzQyNWM2YzM1Mw==
 +    sha1: e3f29042027c466333df66a555a2088d99d06e26
 +  87db3d03e1ac9d8c6ceffb4d2c6ccc541ecd8d49:
 +    version: 87db3d03e1ac9d8c6ceffb4d2c6ccc541ecd8d49
     blobstore_id: 648f14e3-9a6e-4957-a158-2f893f48dde9
 -format-version: '2'
 +    sha1: 1d078be4c85edf7e0b9cc9d98e87663425c6c353
 +  8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4:
 +    version: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +    blobstore_id: b2a04bc8-9a72-49d7-6c26-e200dfeea04f
 +    sha1: sha256:d6bee2f4affe504ffdad47b3162b362ff30c0cb5b6f466a4838241297cb85ad1
 +  c44f6d7c7c4ccfc5142f4cd6447a0087249028eeea00874cc03430e8d57f82ab:
 +    version: c44f6d7c7c4ccfc5142f4cd6447a0087249028eeea00874cc03430e8d57f82ab
 +    blobstore_id: 06fa8704-3256-46be-5765-196e67bb41da
 +    sha1: sha256:cf31d9e65b2c2bf7d1916f2f96abaf3225e5758ad64b5614fbf044d573d6ca4a
 +format-version: "2"
 diff --git cloud.gov/.final_builds/packages/curator/index.yml cloudfoundry-community/.final_builds/packages/curator/index.yml
 index af49279..ce6ac46 100644
 --- cloud.gov/.final_builds/packages/curator/index.yml
 +++ cloudfoundry-community/.final_builds/packages/curator/index.yml
 @@ -15,10 +15,18 @@ builds:
     version: 41bff5fee0b0f2f86ed876122f3fbafe44460fb3
     blobstore_id: d6820d5e-a456-4c1a-87f9-c764c129e1bc
     sha1: e2c352cfece6086e57fdc347c885e3b61bc1f7c0
 +  5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87:
 +    version: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +    blobstore_id: d61bb181-84f9-4609-6763-8faa0c2027ed
 +    sha1: sha256:3e527a7f273585f650f631b3377e4c2b7cd170fabb2e8c3f310438305e8af70c
   7ebf83512ccde997d8524530703698f9f335e5c6:
     version: 7ebf83512ccde997d8524530703698f9f335e5c6
     blobstore_id: 76f929f4-48d8-46fb-8826-d45effc50cdd
     sha1: b755f32ed747fff9f39f2c020e29f079a39ef0d6
 +  86c5c2302a0c376bef9d3334508e57d89431e3ea96486d5e0763ab2fe2a9abf7:
 +    version: 86c5c2302a0c376bef9d3334508e57d89431e3ea96486d5e0763ab2fe2a9abf7
 +    blobstore_id: 1da0e562-507d-46af-6dd2-95012178622e
 +    sha1: sha256:4e9ab0fefc2032e2f17e36e3099b94a72a092e4551951b856dc343f0125ddb89
   908fcc0003641706e61f0b38a6ee764271218286:
     version: 908fcc0003641706e61f0b38a6ee764271218286
     blobstore_id: ef547482-3df4-474e-a871-eeb6d86e79c6
 diff --git cloud.gov/.final_builds/packages/elasticsearch/index.yml cloudfoundry-community/.final_builds/packages/elasticsearch/index.yml
 index f9d9c7b..6deb583 100644
 --- cloud.gov/.final_builds/packages/elasticsearch/index.yml
 +++ cloudfoundry-community/.final_builds/packages/elasticsearch/index.yml
 @@ -3,6 +3,14 @@ builds:
     version: "2"
     blobstore_id: c371d732-0ca2-409e-a70c-90d5ff267b34
     sha1: 1d9c26287fd045904721a7c3fc73585107bfa29d
 +  056589862572dda711df4f887c8dd0ce03ee8baf03918fe549f874a40a748e91:
 +    version: 056589862572dda711df4f887c8dd0ce03ee8baf03918fe549f874a40a748e91
 +    blobstore_id: 54658d5d-0a58-4539-7ca0-3d8ba94c7477
 +    sha1: sha256:42b2348f0c5a812127a4109b4177cc5bdd559d96c4b0b845165656123c713225
 +  07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037:
 +    version: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +    blobstore_id: eeffbb2e-5063-4834-64b1-7554db505110
 +    sha1: sha256:a946105a304aff03b30b3b062f95368be466f856e50aa8542c0e3044c03b4758
   18e8357e58af213de93e46cd7c5ee133ec4f45f9:
     version: 18e8357e58af213de93e46cd7c5ee133ec4f45f9
     blobstore_id: ade4b136-ae0e-4b77-b426-94fab7539ec3
 @@ -15,10 +23,18 @@ builds:
     version: 48e3bb32aa0e51cda07ce46deef1f9446538379e
     blobstore_id: acfe3fd8-9241-46cb-a972-85534cef420c
     sha1: 2d1944af7686033572f56952212c7db8f5b45e65
 +  5a48bac4731a10de201ec9d9609472cefbe7c4c3:
 +    version: 5a48bac4731a10de201ec9d9609472cefbe7c4c3
 +    blobstore_id: d3be3846-8fe5-403c-5020-a1c6382332e5
 +    sha1: 95267f4a5aa29d17011a5792289ec5774d50481f
   6c6b26479631cbbd19f90edd03d3fd5d42283dfa:
     version: 6c6b26479631cbbd19f90edd03d3fd5d42283dfa
     blobstore_id: b2d67d4e-541f-4bac-9272-a24167859d57
     sha1: 5ada71ed60287f9ca7db09ee192db8dbeed6bf56
 +  866283a5066a134d33bbc137250de7a104138bcbb88dddbe6042cd285b515402:
 +    version: 866283a5066a134d33bbc137250de7a104138bcbb88dddbe6042cd285b515402
 +    blobstore_id: 3777d6a8-d1fe-4aee-6dfb-9fed05b421b8
 +    sha1: sha256:b1e2c9f12d2f54c906bf6503a917b0e2630d327807d1cb6e483cc3211f209a8b
   9737710adb4ed0c0ccd63b33f64afdb32f2f2aac:
     version: 9737710adb4ed0c0ccd63b33f64afdb32f2f2aac
     blobstore_id: 7953a001-3271-4f1c-9061-c7239ad5d65f
 diff --git cloud.gov/.final_builds/packages/haproxy/index.yml cloudfoundry-community/.final_builds/packages/haproxy/index.yml
 index b8924f7..8aea544 100644
 --- cloud.gov/.final_builds/packages/haproxy/index.yml
 +++ cloudfoundry-community/.final_builds/packages/haproxy/index.yml
 @@ -1,23 +1,26 @@
 ----
 builds:
 -  573867753d537389a6fc463d8376f57cd710ca0b:
 -    version: 573867753d537389a6fc463d8376f57cd710ca0b
 -    sha1: d76785c70a365862c9d022677490037aaaa83ccd
 -    blobstore_id: 75913f6f-7fe5-45d8-8448-e1e86df37354
 +  1d59aa8ae61da532ade4e9f5129428bbc101be64:
 +    version: 1d59aa8ae61da532ade4e9f5129428bbc101be64
 +    blobstore_id: 5c5c0553-7cfa-4e02-8c8f-41f11bacddcd
 +    sha1: abeb910545f33d77dbec00672f28d40edd9514dd
   231e1fbdfee34eefddc2ce45eccd74272c68c98b:
     version: 231e1fbdfee34eefddc2ce45eccd74272c68c98b
 -    sha1: dea0e79328f88ea5d64bf7f1acb0cb40ce5284c3
     blobstore_id: 00c1d468-1ad6-43e1-be65-d9b8404271b4
 +    sha1: dea0e79328f88ea5d64bf7f1acb0cb40ce5284c3
   29b2de09910256729ac5c0ff05c78417d749b7ca:
     version: 29b2de09910256729ac5c0ff05c78417d749b7ca
 -    sha1: 1854f12752f3973d327a8ccfd091d9ea3c4a0d80
     blobstore_id: f0c0f066-a203-4914-aefa-b884ad97e3b2
 +    sha1: 1854f12752f3973d327a8ccfd091d9ea3c4a0d80
 +  573867753d537389a6fc463d8376f57cd710ca0b:
 +    version: 573867753d537389a6fc463d8376f57cd710ca0b
 +    blobstore_id: 75913f6f-7fe5-45d8-8448-e1e86df37354
 +    sha1: d76785c70a365862c9d022677490037aaaa83ccd
   acb734c5a536923af60e0423cd985b87883377b0:
     version: acb734c5a536923af60e0423cd985b87883377b0
 -    sha1: aabf1f05860b11b120f225474cd24ca79c97d151
     blobstore_id: 9d3bd695-f5c3-4859-b9ea-d274cab2dfb3
 -  1d59aa8ae61da532ade4e9f5129428bbc101be64:
 -    version: 1d59aa8ae61da532ade4e9f5129428bbc101be64
 -    sha1: abeb910545f33d77dbec00672f28d40edd9514dd
 -    blobstore_id: 5c5c0553-7cfa-4e02-8c8f-41f11bacddcd
 -format-version: '2'
 +    sha1: aabf1f05860b11b120f225474cd24ca79c97d151
 +  b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a:
 +    version: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +    blobstore_id: 776c2677-0eb9-47b1-61fb-7f34fe5be8cd
 +    sha1: sha256:b0d344ae781133b10b392fa0eabd11e6c6b1603b7bf3cdbddc0a336a9cf32e30
 +format-version: "2"
 diff --git cloud.gov/.final_builds/packages/java8/index.yml cloudfoundry-community/.final_builds/packages/java8/index.yml
 index f49b96d..cbb6aa7 100644
 --- cloud.gov/.final_builds/packages/java8/index.yml
 +++ cloudfoundry-community/.final_builds/packages/java8/index.yml
 @@ -23,4 +23,12 @@ builds:
     version: b9eec8eddbc71555fba60cf42fa525eea6e64e2d
     blobstore_id: 567065b4-86e0-450f-86bf-68e5171afe4e
     sha1: 8b1545e7195c62feca62c103b406dde6c77f78e8
 +  e874992b9a29c7b09b2c4f98b60646cdeee6dc7020a84c55438eb18f3bab15d2:
 +    version: e874992b9a29c7b09b2c4f98b60646cdeee6dc7020a84c55438eb18f3bab15d2
 +    blobstore_id: bb827699-3101-4317-61db-9eacd29eeffe
 +    sha1: sha256:853cb84e8423ff216ed74a886b9c556799af0a9986e877b06463631c617c496f
 +  f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d:
 +    version: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +    blobstore_id: 1328331e-8a63-4b12-41f8-030f06fcd773
 +    sha1: sha256:5e9c769fb42822b0e33ecc21fc50a4f8584e399a45ccf33b2cc99a96372d1a30
 format-version: "2"
 diff --git cloud.gov/.final_builds/packages/kibana/index.yml cloudfoundry-community/.final_builds/packages/kibana/index.yml
 index 67fa0ed..ba12c7a 100644
 --- cloud.gov/.final_builds/packages/kibana/index.yml
 +++ cloudfoundry-community/.final_builds/packages/kibana/index.yml
 @@ -3,6 +3,10 @@ builds:
     version: 0b8a4b481a8c3ef37906f6be3ab5b8e4c2cc01ac
     blobstore_id: eabb6cb6-1376-4230-6db7-80bcb82ecafc
     sha1: fa9218ee5d46730f1fc9f59381256c16323de32c
 +  3188dfce2368f99e527bc51088e6b56c39ea41efca693e03f271a82ff6711661:
 +    version: 3188dfce2368f99e527bc51088e6b56c39ea41efca693e03f271a82ff6711661
 +    blobstore_id: 72c535d2-02d8-4dfe-7adf-0e05660343b6
 +    sha1: sha256:b5a497238847951854352a74dc198df0461795c0d33331bd3b0a9fce00ac081e
   3618a5829d8db591d9b5c84e15499a7daaadbb4c:
     version: 3618a5829d8db591d9b5c84e15499a7daaadbb4c
     blobstore_id: 27b9bc9d-0d32-4b72-acbd-4865f7e183e8
 @@ -19,6 +23,10 @@ builds:
     version: 4fff443e15e6003b9796bb29b861306ce399268c
     blobstore_id: 4c69a6db-8e67-45e4-8585-669eb2f6b266
     sha1: 2cbf11699b09dd703d9acde7b433f861cc9248ea
 +  51879ff6829ee757ea1913d9d7f1ede7254636cb6b08b35fe43a8e6f6d99f982:
 +    version: 51879ff6829ee757ea1913d9d7f1ede7254636cb6b08b35fe43a8e6f6d99f982
 +    blobstore_id: 729b490b-3d90-4d63-5d5b-9daab41b0ae6
 +    sha1: sha256:87ca5ba758cdf31680564091d43b7d9e3e5dc8bca782b6b01acaffaac8bb6798
   732483c8ea904ec3befca2e7dcbb404e822eca64:
     version: 732483c8ea904ec3befca2e7dcbb404e822eca64
     blobstore_id: 3bd269d1-1866-4e14-b751-a257807e448f
 @@ -27,6 +35,14 @@ builds:
     version: 7fa43d279fd95f6037882bdd813a66749a14dc2d
     blobstore_id: 72de1771-bd8c-49f1-8eea-0efd64f41e49
     sha1: 2c8ac1e8ae04a1bbe7f1963f38bc1968e465ba36
 +  844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75:
 +    version: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +    blobstore_id: 11ec38e9-76eb-42bc-5608-a1ca91657a30
 +    sha1: sha256:da12681a7d036eec956e55b8f3d53129668cdbcef27854caf09f9ecedc96eed5
 +  9ef74afdbaaeadafda168bc8cdd7149e6a78611b:
 +    version: 9ef74afdbaaeadafda168bc8cdd7149e6a78611b
 +    blobstore_id: 1ec57323-e6a6-4784-68ac-40bce1c294fa
 +    sha1: 07855a16da4c3dc56cdf173ed105cb51ea0c9b55
   a2347817ecb9a24a18a3729d94d65ac1b9efa5d7:
     version: a2347817ecb9a24a18a3729d94d65ac1b9efa5d7
     blobstore_id: e51a4ede-33df-4f3b-aa93-726bf1e103ab
 diff --git cloud.gov/.final_builds/packages/logsearch-config/index.yml cloudfoundry-community/.final_builds/packages/logsearch-config/index.yml
 index 3d7cab2..70195f8 100644
 --- cloud.gov/.final_builds/packages/logsearch-config/index.yml
 +++ cloudfoundry-community/.final_builds/packages/logsearch-config/index.yml
 @@ -11,6 +11,10 @@ builds:
     version: 399222f83c686aeb224c281c0d760b705c7a2495
     blobstore_id: a5d3ad47-9a9c-41b1-9c7d-089c7e337082
     sha1: 22b3d7405be359ef95dfc2613ea4df9042d4a88b
 +  3ffd3cd06b6723b9486825cb15b0ba6038ae2bdc:
 +    version: 3ffd3cd06b6723b9486825cb15b0ba6038ae2bdc
 +    blobstore_id: 4c8b82ea-850b-4a86-4522-a12a1e3ea714
 +    sha1: f6ab4d992d5fa727d464aa55d3bf5a428da7ea11
   59734a3f17df3b350c3b10263e9227fb3006af48:
     version: 59734a3f17df3b350c3b10263e9227fb3006af48
     blobstore_id: 5bff8e54-6f07-439d-aae5-9b4f2ba83c62
 @@ -31,10 +35,18 @@ builds:
     version: 7a3e1f17f02bf544c3957b2d88b9137fc6dbf616
     blobstore_id: 8a5dfa97-3193-4b1d-82f7-865b1f529850
     sha1: f38e13b7c86ad357188803d991a836bc68c00691
 +  8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3:
 +    version: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +    blobstore_id: d6e7f1e2-c0bd-4f3a-653c-a57bcd245a87
 +    sha1: sha256:e4f0707a47ee273cf9ef11574b7c310f5df24fbca792d7465f69404506373d16
   9146b36c66b976a9ec32ddb2a5842412d77c97e3:
     version: 9146b36c66b976a9ec32ddb2a5842412d77c97e3
     blobstore_id: 58714cc6-f187-47fe-9b46-672c9f81f9fc
     sha1: e02a5be5c9dc60d17128416360b4f20a6e3c0f7d
 +  92c9feec89da10cdeedce23076adff110f62478bade9c24c3ac6f1da30f1fc60:
 +    version: 92c9feec89da10cdeedce23076adff110f62478bade9c24c3ac6f1da30f1fc60
 +    blobstore_id: eacdb588-73df-4e3a-6d3f-75b29846239e
 +    sha1: sha256:935c169c61c442997ccbb714c0c856b2e1d629f4b1f2ab824bf6096652f2a4db
   a91ea9cc6f3ccb7556f91c97973456d864377f58:
     version: a91ea9cc6f3ccb7556f91c97973456d864377f58
     blobstore_id: 2d83f907-2e7b-4843-8ec9-7fd31710f5e8
 diff --git cloud.gov/.final_builds/packages/logstash/index.yml cloudfoundry-community/.final_builds/packages/logstash/index.yml
 index 9865d20..bb8b71d 100644
 --- cloud.gov/.final_builds/packages/logstash/index.yml
 +++ cloudfoundry-community/.final_builds/packages/logstash/index.yml
 @@ -7,6 +7,10 @@ builds:
     version: 09006827e50827c7c9b3edb25602b34eff60a3a6
     blobstore_id: 71eb3824-e6d2-4edb-98a6-4556ec334e65
     sha1: 95346e99e5e35e186d63762f1fde78fcd0857f44
 +  423926d48b7d1e6b99e10b4a1bb921af98b2827d5d769e43f226712b62247435:
 +    version: 423926d48b7d1e6b99e10b4a1bb921af98b2827d5d769e43f226712b62247435
 +    blobstore_id: 7aad52d0-0d77-4781-4008-40417b90a43f
 +    sha1: sha256:4b7332bfb949a2677477e39cd4fff0fbabbf2e0f0cae2b8770c5c087dc122e21
   4ffb9c1f786b2ebe60399309e86927210eb48934:
     version: 4ffb9c1f786b2ebe60399309e86927210eb48934
     blobstore_id: 06e04c2a-9a17-46e3-9bf3-8f7b6777849d
 @@ -31,6 +35,14 @@ builds:
     version: 63fb88482a13b2988623ce6477e44d2b2cf6c271
     blobstore_id: b4b63b07-ea81-4527-9a59-c6b9598fd6f2
     sha1: e488d61be78d46625840aa48a2519e5a7b975311
 +  6c2eb590f7cbddd42b478700d4815b597b8442f14c3768304e4a8890883dccc9:
 +    version: 6c2eb590f7cbddd42b478700d4815b597b8442f14c3768304e4a8890883dccc9
 +    blobstore_id: c4c2bea3-42e8-4d25-4ea1-bb1ba76ce422
 +    sha1: sha256:ca4f9260aa57a66ce029d7326b09ce33d81d7f4d2611596d4e888131252f23b9
 +  6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42:
 +    version: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +    blobstore_id: 4b2de3e4-28da-4d71-5d2d-6caf824fe625
 +    sha1: sha256:d2feb130384b4b2345b75ac9bb4fd95bc38329433cdb468c4cfd043f04553714
   6f734a70466185468a448adf9e592157c92d482e:
     version: 6f734a70466185468a448adf9e592157c92d482e
     blobstore_id: d335d812-377b-47f1-855c-f9f35faa8c96
 @@ -79,6 +91,10 @@ builds:
     version: ddcacfa5c7c72c956570dfc5861d476e8faa2689
     blobstore_id: e1f32451-ddb2-4617-9687-2cbbe2c82e1b
     sha1: 3ae32bb9a2bc61a19fe39835cfb363a6777bc212
 +  e1617fae133c689b720a0a0cbe8d717ff27df701:
 +    version: e1617fae133c689b720a0a0cbe8d717ff27df701
 +    blobstore_id: 54e70afd-903a-4754-5765-cbbb443c54a4
 +    sha1: 6bcefae56cef2dfdc894355399952336e5ce707a
   e890aaee894dcfe39c8fde7cce3352f7122582f0:
     version: e890aaee894dcfe39c8fde7cce3352f7122582f0
     blobstore_id: 96287172-0f47-4fec-8364-85bb13f1a71b
 diff --git cloud.gov/.final_builds/packages/nats_to_syslog/index.yml cloudfoundry-community/.final_builds/packages/nats_to_syslog/index.yml
 index e63d0ae..a19188f 100644
 --- cloud.gov/.final_builds/packages/nats_to_syslog/index.yml
 +++ cloudfoundry-community/.final_builds/packages/nats_to_syslog/index.yml
 @@ -1,11 +1,14 @@
 ----
 builds:
   3637720b6088244e7d7fc6e718ccf526f327e8a9:
     version: 3637720b6088244e7d7fc6e718ccf526f327e8a9
 -    sha1: e7138814e6dc8fdb171b8f18dca38e3f5b03ec0f
     blobstore_id: 1157cf71-fdb0-4216-ad23-7982082cd581
 +    sha1: e7138814e6dc8fdb171b8f18dca38e3f5b03ec0f
 +  87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1:
 +    version: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +    blobstore_id: 185ee0f6-90e8-4486-58d2-d7f166edc4d8
 +    sha1: sha256:65d55addd7aa5a479cbf1e48ccd4cc03aaf0d82477497107eecab569ddf40115
   f3267716fa78721e65fc1b804684dd6c4bd3de9d:
     version: f3267716fa78721e65fc1b804684dd6c4bd3de9d
 -    sha1: 03f165e256f67227825ec586e33af247923252b8
     blobstore_id: 376e602a-6c2e-447e-a0ce-ec77e15cc436
 -format-version: '2'
 +    sha1: 03f165e256f67227825ec586e33af247923252b8
 +format-version: "2"
 diff --git cloud.gov/.final_builds/packages/openjdk-8/index.yml cloudfoundry-community/.final_builds/packages/openjdk-8/index.yml
 new file mode 100644
 index 0000000..1c040e2
 --- /dev/null
 +++ cloudfoundry-community/.final_builds/packages/openjdk-8/index.yml
 @@ -0,0 +1,6 @@
 +builds:
 +  2d3d1ec9f37bcd93bfefc839ee159be28519b20a:
 +    version: 2d3d1ec9f37bcd93bfefc839ee159be28519b20a
 +    blobstore_id: f93d3fd0-45f8-428c-46d2-1072173a6eb4
 +    sha1: 0801e3d340c536ce67b664ff033758f31270d693
 +format-version: "2"
 diff --git cloud.gov/.final_builds/packages/python3/index.yml cloudfoundry-community/.final_builds/packages/python3/index.yml
 index 6af4ba6..1c0036a 100644
 --- cloud.gov/.final_builds/packages/python3/index.yml
 +++ cloudfoundry-community/.final_builds/packages/python3/index.yml
 @@ -1,12 +1,24 @@
 builds:
 +  3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21:
 +    version: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +    blobstore_id: 6b547cfc-c4b3-48cc-4207-1aab86558be7
 +    sha1: sha256:f84d2ebc54841c09718448554175b2941f4559979bbbd87ba88d261d10000c2e
   3b8e06104aadf905036bb91e57632a4fb4f662b1:
     version: 3b8e06104aadf905036bb91e57632a4fb4f662b1
     blobstore_id: c3e58ad2-a739-4d1b-a443-fd73cf81ba6e
     sha1: d935afedaf6f4a64b642c4257dddfc6780dacef0
 +  65e174068552708f0e7e99d22c8cb1c4eae53053d1fd12cbdbb4d0e80523a989:
 +    version: 65e174068552708f0e7e99d22c8cb1c4eae53053d1fd12cbdbb4d0e80523a989
 +    blobstore_id: 9a0021ec-51b1-432d-4423-3f97f8612cce
 +    sha1: sha256:329e92a15c42f8c8cc769e9088cd1e6e5fd76c3f627805ad2357869644dd9b73
   6bb4b525f20f5d4223bc1cde359e33637ffaf858:
     version: 6bb4b525f20f5d4223bc1cde359e33637ffaf858
     blobstore_id: 992220e1-a931-4a9b-5b57-ca57f9716817
     sha1: e0c3bbd531327efe51943be7fc8d115b0f585dfb
 +  850f5cf587498a0d127464f069b8599593b42ee4fdf381efb62cc309ed19760a:
 +    version: 850f5cf587498a0d127464f069b8599593b42ee4fdf381efb62cc309ed19760a
 +    blobstore_id: 71de6c36-e21d-47fb-48e8-0a1d8e081913
 +    sha1: sha256:154272da05fae241a02284c16c98280446f3f8897770c72132a11d2b25b608dd
   b924757c5ebfd05dba396099bbae0a9f83b54d38:
     version: b924757c5ebfd05dba396099bbae0a9f83b54d38
     blobstore_id: 4b489b8d-899b-4a28-9f6e-41b1560b80f6
 diff --git cloud.gov/.final_builds/packages/ruby-2.4-r5/index.yml cloudfoundry-community/.final_builds/packages/ruby-2.4-r5/index.yml
 new file mode 100644
 index 0000000..dfad988
 --- /dev/null
 +++ cloudfoundry-community/.final_builds/packages/ruby-2.4-r5/index.yml
 @@ -0,0 +1,6 @@
 +builds:
 +  726cbb2214e138b576700db6a30698edb2b994e2:
 +    version: 726cbb2214e138b576700db6a30698edb2b994e2
 +    blobstore_id: 6b39b872-2dbf-4e97-76c7-001d3e8a7d80
 +    sha1: 6addce325a193d9f2c326dbd926ab42dc023f132
 +format-version: "2"
 diff --git cloud.gov/.final_builds/packages/ruby2.3/index.yml cloudfoundry-community/.final_builds/packages/ruby2.3/index.yml
 index bc12952..84a3bda 100644
 --- cloud.gov/.final_builds/packages/ruby2.3/index.yml
 +++ cloudfoundry-community/.final_builds/packages/ruby2.3/index.yml
 @@ -3,6 +3,10 @@ builds:
     version: 613589acad7ddafc74fd12316e3d9cf5346f612e
     blobstore_id: 7d22e631-5221-415b-7ff2-96b76425dc6a
     sha1: ab5bb90fdd1afdd195ef0d72f23fb2823ecc1527
 +  829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d:
 +    version: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +    blobstore_id: 96ec893c-829d-4f4d-6d55-dacc323506b2
 +    sha1: sha256:2f4deb31c7642d4bded2623e47332a393cc98b7a060b732d6084de0ab52c7b09
   fb06f47a9242f5fef6c0449f73e88fe13f4b3073:
     version: fb06f47a9242f5fef6c0449f73e88fe13f4b3073
     blobstore_id: 67efed9f-878d-4f44-abb7-3146b27027ee
 diff --git cloud.gov/.gitignore cloudfoundry-community/.gitignore
 index 4b3f21c..38e1510 100644
 --- cloud.gov/.gitignore
 +++ cloudfoundry-community/.gitignore
 @@ -24,3 +24,4 @@ version
 
 /logsearch-config
 /logsearch-config.tgz
 +deployment/ci/logsearch-vars.yml
 diff --git cloud.gov/README.md cloudfoundry-community/README.md
 index 6efee4e..7e56bb3 100644
 --- cloud.gov/README.md
 +++ cloudfoundry-community/README.md
 @@ -11,11 +11,17 @@ Logsearch < v23.0.0 was based on Elasticsearch 1.x and Kibana 3.
 
 Logsearch > v200 is based on Elasticsearch 2.x and Kibana 4.
 
 -There is NO upgrade path from Elasticsearch 1.x to 2.x.  Sorry :(
 +- There is NO upgrade path from Elasticsearch 1.x to 2.x.  Sorry :(
 
 -Logsearch > v204.0.0 is based on Elasticsearch 5.x and Kibana 5.
 +Logsearch > v204.0.0 is based on Elastic stack version 5.
 +
 +- For upgrade procedure from Elasticsearch 2.x please refer to [v205.0.0 release notes](https://github.com/cloudfoundry-community/logsearch-boshrelease/releases/tag/v205.0.0#component-updates).
 +
 +Logsearch > v210.0.0 is based on Elastic stack version 6.
 +
 +- Elasticsearch 6.x can use indices created in Elasticsearch 5.x, but not those created in Elasticsearch 2.x or before.
 +- **Important**: After upgrading running 5.x cluster to 6.x all existing indicies will be available for reading data. However, writing to these indicies is not possible. In order to write data immediatelly after upgrade you have to [change index naming convention](https://github.com/cloudfoundry-community/logsearch-boshrelease/commit/2f83b41ee14dbe3141e21cc0c40df340d50e0169). As long as index names are usually based on current date, this change can be safely reverted in a day or so.
 
 -For upgrade procedure from Elasticsearch 2.x please refer to [v205.0.0 release notes](https://github.com/cloudfoundry-community/logsearch-boshrelease/releases/tag/v205.0.0#component-updates).
 
 ## Getting Started
 
 @@ -28,65 +34,15 @@ for a list of the common Addons:
 
   * [Logsearch for CloudFoundry](https://github.com/cloudfoundry-community/logsearch-for-cloudfoundry)
 
 -If you are sure you want install just Logsearch Core, read on...
 
 ## Installing Logsearch Core
 -
 -0. Upload the latest logserach release
 -
 -   * Download the latest logsearch release
 -   
 -     NOTE: At the moment you can get working logsearch release by cloning Git repository and creating bosh release from it.
 -
 -      Example:
 -   
 -      ```sh
 -      $ git clone https://github.com/cloudfoundry-community/logsearch-boshrelease.git
 -      $ cd logsearch-boshrelease
 -      $ bosh create release
 -      ```
 -   
 -   * Upload bosh release
 -   
 -      Example:
 -
 -      ```sh
 -      $ bosh upload release
 -      ```
 -   
 -0. Customise your deployment stub:
 -
 -   * Make a copy of `templates/stub.$INFRASTRUCTURE.example.yml` to `stub-logsearch.yml`
 -   
 -      Example: 
 -      ```sh
 -      $ cp logsearch-boshrelease/templates/stub.openstack.example.yml stub-logsearch.yml
 -      ```
 -     
 -   * Edit `stub-logsearch.yml` to match your IAAS settings
 -
 -0. Generate a manifest with `scripts/generate_deployment_manifest $INFRASTRUCTURE stub-logsearch.yml > logsearch.yml`
 -
 -   Example: 
 -   
 -   ```sh
 -   $ logsearch-boshrelease/scripts/generate_deployment_manifest openstack stub-logsearch.yml > logsearch.yml
 -   ```
    
 -   Notice `logsearch.yml` generated.
 -
 -0. Make sure you have these 2 security groups configured:
 -
 -   * `bosh` which allow access from this group itself
 -
 -   * `logsearch` which allow access to ports 80, 8080, 8888
 -
 -0. Deploy!
 -
 -   ```sh
 -   $ bosh -d logsearch.yml deploy
 -   ```
 +Before starting deployment, make sure your BOSH environment is ready, and all `BOSH_` evironment variables are set. We suggest you to use [BBL](https://github.com/cloudfoundry/bosh-bootloader) tool to spin up the BOSH environment.
 
 +```
 +$ cd deployment
 +$ bosh -d logsearch deploy logsearch-deployment.yml
 +```
 ## Common customisations:
 
 0. Adding new parsing rules:
 diff --git cloud.gov/ci/jobs.yml cloudfoundry-community/ci/jobs.yml
 index 2473965..8321f85 100644
 --- cloud.gov/ci/jobs.yml
 +++ cloudfoundry-community/ci/jobs.yml
 @@ -27,12 +27,12 @@ jobs:
       - get: logsearch-boshrelease
         trigger: true
         passed: [logsearch-boshrelease]
 -      - get: aws-stemcell-xenial
 +      - get: aws-stemcell
     - task: build-manifest
       file: logsearch-boshrelease/ci/tasks/build-manifest.yml
     - put: chai-deployment
       params:
         manifest: build-manifest/logsearch-boshrelease/logsearch.yml
 -        stemcells: [aws-stemcell-xenial/*.tgz]
 +        stemcells: [aws-stemcell/*.tgz]
         releases: [logsearch-tarball/*.tgz]
 
 diff --git cloud.gov/ci/resources.yml cloudfoundry-community/ci/resources.yml
 index b9150be..f4d31a2 100644
 --- cloud.gov/ci/resources.yml
 +++ cloudfoundry-community/ci/resources.yml
 @@ -6,11 +6,11 @@ resources:
     branch: develop
     private_key: {{logsearch-boshrelease-access-key}}
 
 -- name: aws-stemcell-xenial
 +- name: aws-stemcell
   type: bosh-io-stemcell
   check_every: 10080m # 1week
   source:
 -    name: bosh-aws-xen-hvm-ubuntu-xenial-go_agent
 +    name: bosh-aws-xen-hvm-ubuntu-trusty-go_agent
 
 - name: deployment
   type: bosh-deployment
 diff --git cloud.gov/config/blobs.yml cloudfoundry-community/config/blobs.yml
 index 8313b24..d7dee1b 100644
 --- cloud.gov/config/blobs.yml
 +++ cloudfoundry-community/config/blobs.yml
 @@ -1,87 +1,39 @@
 -cerebro/cerebro-0.6.6.tgz:
 -  size: 51199362
 -  object_id: fda10e6d-aeba-47b6-6f0d-fa313cffc109
 -  sha: 69bc2aafb2c5966163c44b19f2768eb9f497aac3
 -curator/elasticsearch-curator-5.6.0.tar.gz:
 -  size: 216257
 -  object_id: c98c348d-8d8f-4282-7541-e59f3fd4b6b7
 -  sha: f147f5353d6a1d78372d33a844a7b7abdf3baa02
 -curator/vendor/PyYAML-3.13.tar.gz:
 -  size: 270607
 -  object_id: 2a49a6ea-da04-45cd-4e89-c1928442840e
 -  sha: 22f95fe2f5ef29ab17110f92c7186e2cfde6b419
 -curator/vendor/boto3-1.9.82.tar.gz:
 -  size: 93140
 -  object_id: 1e9ea11c-17ac-41a1-5a77-089a5824a057
 -  sha: e954c037eb6e6bfe03da1d744060210d5b7bd2f7
 -curator/vendor/botocore-1.12.82.tar.gz:
 -  size: 5384117
 -  object_id: 15e9a7ab-fbad-497f-6ca0-202c888e58da
 -  sha: 8f948d630c1e7923178e45efc172a2c9958fe47d
 -curator/vendor/certifi-2018.11.29.tar.gz:
 -  size: 153772
 -  object_id: 66f0e410-bcb8-4dad-56bd-4ca7d4926657
 -  sha: 673bf8bc29d7ee0a1a0d8af74d050e5769fec2a9
 -curator/vendor/chardet-3.0.4.tar.gz:
 -  size: 1868453
 -  object_id: 69020ece-ced8-4500-7963-da3d16ea384d
 -  sha: 4766fb07e700945a7085d073257f1f320d037ce8
 -curator/vendor/click-6.7.tar.gz:
 -  size: 279019
 -  object_id: a5fb880e-ff09-4066-595f-75bef6708467
 -  sha: c16e7cb561a40c385ae8d1a50528e549cc1d8e94
 -curator/vendor/docutils-0.14.tar.gz:
 -  size: 1727105
 -  object_id: 3e2b271c-64f0-4a9a-78a6-5bb7176fc734
 -  sha: 32cefb69ac3dab5b04c4d150776f35419cc4c863
 -curator/vendor/elasticsearch-6.3.1.tar.gz:
 -  size: 71689
 -  object_id: 451cf218-0196-4729-6986-0c5dde35d4de
 -  sha: 2af07698126e6db63cbebfa338ccb33bc149dc95
 -curator/vendor/idna-2.8.tar.gz:
 -  size: 174481
 -  object_id: 1ab51d63-d306-4ae5-7418-462d4e596db0
 -  sha: c1e59def26dac74a2ec53181032df76d40368657
 -curator/vendor/jmespath-0.9.3.tar.gz:
 -  size: 22967
 -  object_id: 43dea8a4-f7f9-4c43-751a-cde401388868
 -  sha: eca7ba2e8d4fc50239973b59e07f9f527e0c0839
 -curator/vendor/python-dateutil-2.7.5.tar.gz:
 -  size: 316043
 -  object_id: ae61d2fe-dddc-4173-510c-66d2a2053eb5
 -  sha: c99d3a05d0ac220bc736e5e6c169be0ab4a75298
 -curator/vendor/requests-2.21.0.tar.gz:
 -  size: 111528
 -  object_id: ab775746-b1c0-4445-6153-2dd921765a4c
 -  sha: 970805c2affcc5b237d86e7308dc4310f16d6f79
 -curator/vendor/requests-aws4auth-0.9.tar.gz:
 -  size: 44486
 -  object_id: 6792a250-1350-4337-7745-64b1e966a377
 -  sha: e32e9df21c7c790b6f2580463b861a92318b89c2
 -curator/vendor/s3transfer-0.1.13.tar.gz:
 -  size: 103335
 -  object_id: 5d015294-a5dc-4fb3-5bb2-3f984436502a
 -  sha: b85fa93fbd4d9553f1338b68cb7abb70b3de1d71
 -curator/vendor/six-1.12.0.tar.gz:
 -  size: 32725
 -  object_id: 93d0c548-9da6-4c93-4a56-c398741ef281
 -  sha: 1957b44942be21822414f4dde936e6c40b687565
 -curator/vendor/urllib3-1.24.1.tar.gz:
 -  size: 229688
 -  object_id: d97b0e79-d0fc-44eb-7cce-3e3877da11e2
 -  sha: 2d5593e48a650e4ba05358c7d2de865684001948
 -curator/vendor/voluptuous-0.11.5.tar.gz:
 -  size: 44216
 -  object_id: 8c326896-935d-402c-4737-5af2d892c1bd
 -  sha: 8c0aff29b0bae42d001aa304aa056a186b7b03c8
 -elasticsearch/elasticsearch-6.3.2.tar.gz:
 -  size: 91452574
 -  object_id: 3d72ced7-5370-4036-5f63-2d475cb532ee
 -  sha: 7982b300716563125749cd24f9873ea3aed28e4d
 -elasticsearch/elasticsearch-6.4.0.tar.gz:
 -  size: 48660188
 -  object_id: fb6bfc96-4786-47b7-7615-5a81b2336f41
 -  sha: sha256:c2f1a855a4dfca7a0b44edec7fd2d7f4df0b4bda2af5e4abbd144e5370f16bdb
 +cerebro/cerebro-0.8.1.tgz:
 +  size: 56517603
 +  object_id: 6e70a2d9-e205-4dc3-610c-9337ce7242a9
 +  sha: 34f19e3f26d37946e45cad3150cd1815b5abde34
 +curator/elasticsearch-curator-v5.4.0.tar.gz:
 +  size: 293962
 +  object_id: d31708d2-5ffd-4b51-51aa-addb6d0fc9de
 +  sha: 58c7c3962a176e98b16d19b23712accd334f2291
 +curator/vendor/Click-7.0-py2.py3-none-any.whl:
 +  size: 81299
 +  object_id: 2a4ba8b8-f59e-42a5-6ca8-3f4e03749bc6
 +  sha: c5b8267a60ed6a4035eaa575485c2d11d3cf5688
 +curator/vendor/PyYAML-5.1.tar.gz:
 +  size: 274244
 +  object_id: dcd9ec97-c876-4451-5e76-f9aa3f5ab6fd
 +  sha: 53fc16036940089ceadd4127381e40fd6106a7ed
 +curator/vendor/certifi-2019.3.9-py2.py3-none-any.whl:
 +  size: 158601
 +  object_id: 3954b6d3-5aa1-494f-6e1a-044e7f283359
 +  sha: ddcc44d35cf435ddaad142789305e7b95e9644d7
 +curator/vendor/elasticsearch-6.3.1-py2.py3-none-any.whl:
 +  size: 119897
 +  object_id: c105e2e1-af02-4b2f-6dec-58900c4d0eed
 +  sha: 025d9d1f746f31ab49dcac242f79d16d47e6f834
 +curator/vendor/urllib3-1.24.1-py2.py3-none-any.whl:
 +  size: 118086
 +  object_id: c6e3c1ce-e6c2-47cf-7184-5c14528ae214
 +  sha: 5386c8d6788f5d3f2f91556ef77f99af10435b17
 +curator/vendor/voluptuous-0.11.5-py2.py3-none-any.whl:
 +  size: 27677
 +  object_id: 30fbe47c-eb16-4db8-57ce-f853940769c7
 +  sha: b5c82285df0610464a9332c567cf8bd06b8786f6
 +elasticsearch/elasticsearch-6.7.2.tar.gz:
 +  size: 148569042
 +  object_id: 4b97cee3-4be8-41e2-6ec3-a4adeca3df61
 +  sha: sha256:d0ed638c825914d3c5fd8b34f69b5bcf9cfa5cf85af25145ea7a910ea8f708a9
 haproxy/haproxy-1.7.5.tar.gz:
   size: 1743979
   object_id: 27004bb4-29f6-493f-80ec-6a4170a955d5
 @@ -90,22 +42,14 @@ haproxy/pcre-8.40.tar.gz:
   size: 2065161
   object_id: edf51dad-4c6c-4a3d-8ebb-3a9b9f9641e5
   sha: 10384eb3d411794cc15f55b9d837d3f69e35391e
 -java8/openjdk-1.8.0_152.tar.gz:
 -  size: 45661256
 -  object_id: 2211b342-4102-4587-6037-23a143726f2b
 -  sha: 0d5758ed6f0e040684ea8bdf410ba44422f29f47
 -kibana/kibana-6.3.2-linux-x86_64.tar.gz:
 -  size: 205331616
 -  object_id: 95b138c5-a546-47f1-4e8d-6ff6049db06d
 -  sha: 34ee24fec22fa00a349a1fd1cda3855b3432a08a
 -kibana/kibana-6.4.0-linux-x86_64.tar.gz:
 -  size: 132807800
 -  object_id: 8603f187-8cf2-4cf7-7b7e-5e153151a7d5
 -  sha: sha256:f543d8efdf4a3afd8dd654f92da53acde28b37de08f5820b12b92676f22068c7
 -logstash/logstash-6.3.2.tar.gz:
 -  size: 144211416
 -  object_id: 9037c656-133e-41e5-6faa-35bc20270541
 -  sha: 29eede4660b88c0b7182e76d2c3f3a6df29587b8
 +kibana/kibana-6.4.3-linux-x86_64.tar.gz:
 +  size: 235299366
 +  object_id: 0aad6732-1974-4211-6661-6b064d324644
 +  sha: 30d9adca00c0c4bae35b40a305fcb16a046a9601
 +logstash/logstash-6.4.3.tar.gz:
 +  size: 153936585
 +  object_id: 8d5c9c76-018d-4dec-6a31-5dc2c8018c57
 +  sha: cb1c4c6ff2c5ef9b14809733624b5c4b5e55e78d
 logstash/logstash-filter-alter-3.0.2.zip:
   size: 7425
   object_id: 543e5010-6449-400b-489d-31b82dcb4670
 @@ -130,19 +74,27 @@ python/Python-3.6.2.tgz:
   size: 22580749
   object_id: 3f40fd31-5d63-4fe7-4b28-dcdb2cbe1f16
   sha: b157ed490a453387874b354b743d1ae656680403
 -ruby2.3/bundler-1.11.2.gem:
 -  size: 263168
 -  object_id: ce2c212f-c2ff-440e-9f4b-c2c214a010f9
 -  sha: 8eb956dec72da753d3d2a2126c78508b17af434e
 -ruby2.3/rake-11.2.2.gem:
 -  size: 102400
 -  object_id: 757c960e-1536-4be2-b0d9-d4f587e4c6ab
 -  sha: 879e7c02b1a0b37333a91f11621f798deb874b6e
 -ruby2.3/ruby-2.3.1.tar.gz:
 -  size: 17797997
 -  object_id: 0ab54e2b-3919-4e52-b157-50c8a7704cad
 -  sha: c39b4001f7acb4e334cb60a0f4df72d434bef711
 -ruby2.3/rubygems-2.6.4.tgz:
 -  size: 478582
 -  object_id: 4f90feb0-d0cf-41d8-a191-9b63e6f08f27
 -  sha: 8ef39e536af2ecd20b0e7a95765fa6a485087ac8
 +python/requests-2.21.0-py2.py3-none-any.whl:
 +  size: 57987
 +  object_id: 121f40c9-3eef-42d8-77ff-dbf8510fbaff
 +  sha: sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b
 +python/vendor/certifi-2019.3.9-py2.py3-none-any.whl:
 +  size: 158601
 +  object_id: 5bd5a450-971d-4ee9-5aea-97cece4f39dc
 +  sha: sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5
 +python/vendor/chardet-3.0.4-py2.py3-none-any.whl:
 +  size: 133356
 +  object_id: 070aaab6-b96d-4804-5cc3-3fe962c7c80e
 +  sha: sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691
 +python/vendor/idna-2.8-py2.py3-none-any.whl:
 +  size: 58594
 +  object_id: 68a819f8-b5d5-451d-6df7-a2fd9f3b19f7
 +  sha: sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c
 +python/vendor/urllib3-1.24.2-py2.py3-none-any.whl:
 +  size: 131747
 +  object_id: 64fb21d8-4d73-4215-7faf-a6a630d48fa9
 +  sha: sha256:4c291ca23bbb55c76518905869ef34bdd5f0e46af7afe6861e8375643ffee1a0
 +ruby/rake-12.3.2.gem:
 +  size: 87040
 +  object_id: 9d2112bb-271b-45b0-52a1-571ecb6ec1bd
 +  sha: sha256:56362f144a29ffbc5e49161a80ca4e2e6b7da2946170067d624d7603ed51c5eb
 diff --git cloud.gov/config/final.yml cloudfoundry-community/config/final.yml
 index 2d0e93e..ec5f5ac 100644
 --- cloud.gov/config/final.yml
 +++ cloudfoundry-community/config/final.yml
 @@ -2,6 +2,5 @@
 blobstore:
   provider: s3
   options:
 -    bucket_name: cloud-gov-release-blobstore
 -    region: us-gov-west-1
 +    bucket_name: logsearch
 final_name: logsearch
 diff --git cloud.gov/deployment/README.md cloudfoundry-community/deployment/README.md
 index fb0b12d..ef55e1e 100644
 --- cloud.gov/deployment/README.md
 +++ cloudfoundry-community/deployment/README.md
 @@ -1,13 +1,30 @@
 # logsearch-deployment
 
 -## <a name='deploying-logsearch'></a>Deploying Logsearch
 +## Plain Logsearch
 +```
 +$ bosh -e my-env -d logsearch deploy logsearch-deployment.yml \
 +  [ -o operations/CUSTOMIZATION ]
 +```
 
 +## Logsearch with Cloud Foundry plugin
 ```
 -bosh -e my-env -d logsearch deploy logsearch-deployment.yml \
 -  --vars-store env-repo/logsearch-vars.yml \
 +$ bosh -e my-env -d logsearch deploy logsearch-deployment.yml \
   -v cf_admin_password="password" \
   -v uaa_admin_client_secret="secret" \
   -v system_domain="some-domain" \
 -  [ -o operations/CUSTOMIZATION1 ] \
 -  [ -o operations/CUSTOMIZATION2 (etc.) ] 
 +  [ -o operations/CUSTOMIZATION ]
 +```
 +
 +## Using Concourse
 +Concourse deployment leverages `bbl-state` resource created by [bosh-deploy](https://github.com/cloudfoundry/cf-deployment-concourse-tasks/tree/master/bosh-deploy) task of [cf-deployment-concourse-tasks](https://github.com/cloudfoundry/cf-deployment-concourse-tasks).
 +
 +```
 +$ cd ci
 +$ cp logsearch-vars-template.yml logsearch-vars.yml
 +$ vim logsearch-vars.yml
 +
 +$ fly -t mytarget set-pipeline -p logsearch -c logsearch-pipeline.yml -l logsearch-vars.yml
 +$ fly -t mytarget unpause-pipeline -p logsearch
 +$ fly -t mytarget trigger-job  -j logsearch/deploy-logsearch
 ```
 +
 diff --git cloud.gov/deployment/ci/logsearch-pipeline.yml cloudfoundry-community/deployment/ci/logsearch-pipeline.yml
 new file mode 100644
 index 0000000..6a4490e
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/logsearch-pipeline.yml
 @@ -0,0 +1,72 @@
 +resources:
 +- name: logsearch-boshrelease
 +  type: git
 +  source:
 +    uri: https://github.com/cloudfoundry-community/logsearch-boshrelease.git
 +    branch: develop
 +
 +- name: bbl-state
 +  type: git
 +  source:
 +    uri: ((bbl_state_repo))
 +    branch: master
 +    private_key: ((git_private_key))
 +
 +jobs:
 +- name: deploy-logsearch
 +  plan:
 +  - get: logsearch-boshrelease
 +  - get: bbl-state
 +  - task: deploy-logsearch
 +    file: logsearch-boshrelease/deployment/ci/tasks/deploy-logsearch.yml
 +    params:
 +      OPS_FILES: "operations/scale-to-one-az.yml operations/cloudfoundry.yml"
 +      SYSTEM_DOMAIN: ((cf_domain))
 +      ENV_NAME: ((bbl_env_name))
 +
 +- name: smoke-tests
 +  plan:
 +  - get: logsearch-boshrelease
 +  - get: bbl-state
 +    passed:
 +    - deploy-logsearch
 +    trigger: true
 +  - task: smoke-tests
 +    file: logsearch-boshrelease/deployment/ci/tasks/run-errand.yml
 +    params:
 +      ERRAND_NAME: smoke-tests
 +
 +- name: create-uaa-client
 +  plan:
 +  - get: logsearch-boshrelease
 +  - get: bbl-state
 +    passed:
 +    - smoke-tests
 +    trigger: false
 +  - task: create-uaa-client
 +    file: logsearch-boshrelease/deployment/ci/tasks/run-errand.yml
 +    params:
 +      ERRAND_NAME: create-uaa-client
 +
 +- name: upload-kibana-objects
 +  plan:
 +  - get: logsearch-boshrelease
 +  - get: bbl-state
 +    passed:
 +    - create-uaa-client
 +    trigger: false
 +  - task: upload-kibana-objects
 +    file: logsearch-boshrelease/deployment/ci/tasks/run-errand.yml
 +    params:
 +      ERRAND_NAME: upload-kibana-objects
 +
 +- name: delete-logsearch
 +  plan:
 +  - get: logsearch-boshrelease
 +  - get: bbl-state
 +    passed:
 +    - deploy-logsearch
 +  - task: delete-logsearch
 +    file: logsearch-boshrelease/deployment/ci/tasks/delete-logsearch.yml
 +    params:
 +      ENV_NAME: ((bbl_env_name))
 diff --git cloud.gov/deployment/ci/logsearch-vars-template.yml cloudfoundry-community/deployment/ci/logsearch-vars-template.yml
 new file mode 100644
 index 0000000..211861d
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/logsearch-vars-template.yml
 @@ -0,0 +1,7 @@
 +bbl_state_repo: [email protected]:my-github-user/cf-deployment-state.git
 +bbl_env_name: cf
 +cf_domain: cf.example.com
 +git_private_key: |
 +  -----BEGIN RSA PRIVATE KEY-----
 +  ...
 +  -----END RSA PRIVATE KEY-----
 \ No newline at end of file
 diff --git cloud.gov/deployment/ci/tasks/delete-logsearch.sh cloudfoundry-community/deployment/ci/tasks/delete-logsearch.sh
 new file mode 100755
 index 0000000..3cc4737
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/tasks/delete-logsearch.sh
 @@ -0,0 +1,15 @@
 +#!/bin/bash -eux
 +
 +pushd bbl-state/${BBL_STATE_DIR}
 +set +x
 +eval "`bbl print-env`"
 +set -x
 +popd
 +
 +SUFFIX="/bosh-${ENV_NAME}/logsearch"
 +credhub delete -n ${SUFFIX}/cf_admin_password
 +credhub delete -n ${SUFFIX}/uaa_admin_client_secret 
 +credhub delete -n ${SUFFIX}/cf-kibana_client_secret 
 +credhub delete -n ${SUFFIX}/system_domain 
 +
 +bosh -n -d logsearch delete-deployment
 \ No newline at end of file
 diff --git cloud.gov/deployment/ci/tasks/delete-logsearch.yml cloudfoundry-community/deployment/ci/tasks/delete-logsearch.yml
 new file mode 100644
 index 0000000..7cafdb7
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/tasks/delete-logsearch.yml
 @@ -0,0 +1,25 @@
 +---
 +platform: linux
 +
 +image_resource:
 +  type: docker-image
 +  source:
 +    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
 +    tag: v6.8.0
 +
 +inputs:
 +- name: bbl-state             # - The repo containing the Director's bbl state dir
 +- name: logsearch-boshrelease # - This repo
 +
 +run:
 +  path: logsearch-boshrelease/deployment/ci/tasks/delete-logsearch.sh
 +
 +params:
 +  BBL_STATE_DIR: bbl-state
 +  # - Path to the directory containing the `bbl-state.json` file
 +  # - The path is relative to the `bbl-state` input
 +
 +  ENV_NAME:
 +  # - Required
 +  # - It is equal to BBL_ENV_NAME variable of bbl-up task from cf-deployment-concourse-tasks
 +  # - and required to access variables in Credhub
 \ No newline at end of file
 diff --git cloud.gov/deployment/ci/tasks/deploy-logsearch.sh cloudfoundry-community/deployment/ci/tasks/deploy-logsearch.sh
 new file mode 100755
 index 0000000..3a36b6f
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/tasks/deploy-logsearch.sh
 @@ -0,0 +1,25 @@
 +#!/bin/bash -eux
 +
 +pushd bbl-state/${BBL_STATE_DIR}
 +set +x
 +eval "`bbl print-env`"
 +popd
 +
 +FROM="/bosh-${ENV_NAME}/cf"
 +TO="/bosh-${ENV_NAME}/logsearch"
 +
 +CF_PASS=$(credhub get -n ${FROM}/cf_admin_password | grep ^value | awk '{print $2}')
 +credhub set -n ${TO}/cf_admin_password -t value -v ${CF_PASS}
 +UAA_PASS=$(credhub get -n ${FROM}/uaa_admin_client_secret | grep ^value | awk '{print $2}')
 +credhub set -n ${TO}/uaa_admin_client_secret -t value -v ${UAA_PASS}
 +credhub generate -n ${TO}/cf-kibana_client_secret -t password -l 10
 +credhub set -n ${TO}/system_domain -t value -v ${SYSTEM_DOMAIN}
 +set -x
 +
 +arguments=""
 +for op in ${OPS_FILES}
 +do
 +  arguments="${arguments} -o logsearch-boshrelease/deployment/${op}"
 +done
 +
 +bosh -n -d logsearch deploy logsearch-boshrelease/deployment/logsearch-deployment.yml ${arguments}
 \ No newline at end of file
 diff --git cloud.gov/deployment/ci/tasks/deploy-logsearch.yml cloudfoundry-community/deployment/ci/tasks/deploy-logsearch.yml
 new file mode 100644
 index 0000000..07887b0
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/tasks/deploy-logsearch.yml
 @@ -0,0 +1,36 @@
 +---
 +platform: linux
 +
 +image_resource:
 +  type: docker-image
 +  source:
 +    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
 +    tag: v6.8.0
 +
 +inputs:
 +- name: bbl-state             # - The repo containing the Director's bbl state dir
 +- name: logsearch-boshrelease # - This repo
 +
 +run:
 +  path: logsearch-boshrelease/deployment/ci/tasks/deploy-logsearch.sh
 +
 +params:
 +  BBL_STATE_DIR: bbl-state
 +  # - Path to the directory containing the `bbl-state.json` file
 +  # - The path is relative to the `bbl-state` input
 +
 +  SYSTEM_DOMAIN:
 +  # - Required
 +  # - CF system base domain e.g. `my-cf.com`
 +
 +  OPS_FILES:
 +  # - Optional
 +  # - List of operations files to be applied to the manifest
 +  # - Quoted and space-separated
 +  # - Ops will be applied in the order they're listed
 +  # - Paths are relative to root of the `ops-files` input
 +  
 +  ENV_NAME:
 +  # - Required
 +  # - It is equal to BBL_ENV_NAME variable of bbl-up task from cf-deployment-concourse-tasks
 +  # - and required to access variables in Credhub
 \ No newline at end of file
 diff --git cloud.gov/deployment/ci/tasks/run-errand.sh cloudfoundry-community/deployment/ci/tasks/run-errand.sh
 new file mode 100755
 index 0000000..99cc794
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/tasks/run-errand.sh
 @@ -0,0 +1,9 @@
 +#!/bin/bash -eux
 +
 +pushd bbl-state/${BBL_STATE_DIR}
 +set +x
 +eval "`bbl print-env`"
 +set -x
 +popd
 +
 +bosh -n -d logsearch run-errand ${ERRAND_NAME}
 \ No newline at end of file
 diff --git cloud.gov/deployment/ci/tasks/run-errand.yml cloudfoundry-community/deployment/ci/tasks/run-errand.yml
 new file mode 100644
 index 0000000..752cbcf
 --- /dev/null
 +++ cloudfoundry-community/deployment/ci/tasks/run-errand.yml
 @@ -0,0 +1,24 @@
 +---
 +platform: linux
 +
 +image_resource:
 +  type: docker-image
 +  source:
 +    repository: relintdockerhubpushbot/cf-deployment-concourse-tasks
 +    tag: v6.8.0
 +
 +inputs:
 +- name: bbl-state             # - The repo containing the Director's bbl state dir
 +- name: logsearch-boshrelease # - This repo
 +
 +run:
 +  path: logsearch-boshrelease/deployment/ci/tasks/run-errand.sh
 +
 +params:
 +  BBL_STATE_DIR: bbl-state
 +  # - Path to the directory containing the `bbl-state.json` file
 +  # - The path is relative to the `bbl-state` input
 +
 +  ERRAND_NAME:
 +  # - Required
 +  # - Errand name to run
 \ No newline at end of file
 diff --git cloud.gov/deployment/logsearch-deployment.yml cloudfoundry-community/deployment/logsearch-deployment.yml
 index 8a8a079..41d202f 100644
 --- cloud.gov/deployment/logsearch-deployment.yml
 +++ cloudfoundry-community/deployment/logsearch-deployment.yml
 @@ -6,67 +6,8 @@ update:
   max_in_flight: 1
   serial: false
   update_watch_time: 5000-1200000
 +
 instance_groups:
 -- name: smoke-tests
 -  lifecycle: errand
 -  azs:
 -  - z1
 -  instances: 1
 -  vm_type: m3.medium
 -  stemcell: default
 -  update:
 -    max_in_flight: 1
 -    serial: true
 -  networks:
 -  - name: default
 -  jobs:
 -  - name: smoke-tests
 -    release: logsearch-for-cloudfoundry
 -    consumes:
 -      cloud_controller: {from: cloud_controller, deployment: cf}
 -      elasticsearch: {from: elasticsearch_master}
 -    properties:
 -      smoke_tests:
 -        admin_password: "((cf_admin_password))"
 -- name: create-uaa-client
 -  lifecycle: errand
 -  azs:
 -  - z1
 -  instances: 1
 -  vm_type: m3.medium
 -  stemcell: default
 -  update:
 -    max_in_flight: 1
 -    serial: true
 -  networks:
 -  - name: default
 -  jobs:
 -  - name: create-uaa-client
 -    release: logsearch-for-cloudfoundry
 -    consumes:
 -      cloud_controller: {from: cloud_controller, deployment: cf}
 -    properties:
 -      create-uaa-client:
 -        cloudfoundry:
 -          uaa_admin_client_secret: "((uaa_admin_client_secret))"
 -        oauth2_client_secret: "((kibana_oauth2_client_secret))"
 -- name: upload-kibana-objects
 -  lifecycle: errand
 -  azs:
 -  - z1
 -  instances: 1
 -  vm_type: m3.medium
 -  stemcell: default
 -  update:
 -    max_in_flight: 1
 -    serial: true
 -  networks:
 -  - name: default
 -  jobs:
 -  - name: upload-kibana-objects
 -    release: logsearch-for-cloudfoundry
 -    consumes:
 -      elasticsearch: {from: elasticsearch_master}
 - name: elasticsearch_master
   azs:
   - z1
 @@ -74,7 +15,7 @@ instance_groups:
   - z3
   instances: 3
   persistent_disk_type: 5GB
 -  vm_type: m3.medium
 +  vm_type: medium
   stemcell: default
   update:
     max_in_flight: 1
 @@ -92,6 +33,12 @@ instance_groups:
       elasticsearch:
         node:
           allow_master: true
 +        config_options:
 +          xpack.monitoring.enabled: false
 +          xpack.graph.enabled: false
 +          xpack.ml.enabled: false
 +          xpack.security.enabled: false
 +          xpack.watcher.enabled: false
   - name: syslog_forwarder
     release: logsearch
     consumes:
 @@ -112,7 +59,7 @@ instance_groups:
   - z1
   instances: 1
   persistent_disk_type: 100GB
 -  vm_type: m3.large
 +  vm_type: large
   stemcell: default
   update:
     max_in_flight: 1
 @@ -145,10 +92,16 @@ instance_groups:
         - index-mappings: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings.json
   - name: ingestor_syslog
     release: logsearch
 +    consumes:
 +      elasticsearch: nil
     provides:
       syslog_forwarder: {as: cluster_monitor}
 +      ingestor: nil
     properties:
       logstash_parser:
 +        elasticsearch:
 +          data_hosts:
 +          - 127.0.0.1
         filters:
         - monitor: /var/vcap/packages/logsearch-config/logstash-filters-monitor.conf
   - name: curator
 @@ -171,7 +124,7 @@ instance_groups:
   azs:
   - z1
   instances: 1
 -  vm_type: m3.medium
 +  vm_type: medium
   stemcell: default
   update:
     serial: true
 @@ -189,15 +142,10 @@ instance_groups:
           - shards-and-replicas: /var/vcap/jobs/elasticsearch_config/index-templates/shards-and-replicas.json
           - index-settings: /var/vcap/jobs/elasticsearch_config/index-templates/index-settings.json
           - index-mappings: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings.json
 -          - index-mappings-lfc: /var/vcap/jobs/elasticsearch-config-lfc/index-mappings.json
 -          - index-mappings-app-lfc: /var/vcap/jobs/elasticsearch-config-lfc/index-mappings-app.json
 -          - index-mappings-platform-lfc: /var/vcap/jobs/elasticsearch-config-lfc/index-mappings-platform.json
   - name: curator
     release: logsearch
     consumes:
       elasticsearch: {from: elasticsearch_master}
 -  - name: elasticsearch-config-lfc
 -    release: logsearch-for-cloudfoundry
   - name: syslog_forwarder
     release: logsearch
     consumes:
 @@ -207,6 +155,11 @@ instance_groups:
         config:
         - file: /var/vcap/sys/log/curator/curator.log
           service: curator
 +  - name: smoke_tests
 +    release: logsearch
 +    consumes:
 +      elasticsearch: {from: elasticsearch_master}
 +      ingestor_link: {from: ingestor_syslog}
 - name: elasticsearch_data
   azs:
   - z1
 @@ -214,7 +167,7 @@ instance_groups:
   - z3
   instances: 3
   persistent_disk_type: 100GB
 -  vm_type: m3.large
 +  vm_type: large
   stemcell: default
   update:
     max_in_flight: 1
 @@ -230,6 +183,12 @@ instance_groups:
       elasticsearch:
         node:
           allow_data: true
 +        config_options:
 +          xpack.monitoring.enabled: false
 +          xpack.graph.enabled: false
 +          xpack.ml.enabled: false
 +          xpack.security.enabled: false
 +          xpack.watcher.enabled: false
   - name: syslog_forwarder
     release: logsearch
     consumes:
 @@ -249,8 +208,8 @@ instance_groups:
   azs:
   - z1
   instances: 1
 -  persistent_disk_type: 2GB
 -  vm_type: c3.large
 +  persistent_disk_type: 5GB
 +  vm_type: large
   stemcell: default
   networks:
   - name: default
 @@ -259,21 +218,6 @@ instance_groups:
     release: logsearch
     consumes:
       elasticsearch: {from: elasticsearch_master}
 -  - name: redis
 -    release: logsearch-for-cloudfoundry
 -    provides:
 -      redis: {as: redis_link}
 -  - name: kibana-auth-plugin
 -    release: logsearch-for-cloudfoundry
 -    consumes:
 -      cloud_controller: {from: cloud_controller, deployment: cf}
 -      kibana: {from: kibana_link}
 -      redis: {from: redis_link}
 -    properties:
 -      kibana-auth:
 -        cloudfoundry:
 -          client_secret: "((kibana_oauth2_client_secret))"
 -          skip_ssl_validation: true
   - name: kibana
     release: logsearch
     provides:
 @@ -283,13 +227,15 @@ instance_groups:
     properties:
       kibana:
         health:
 -          timeout: 300
 +          timeout: 500
         env:
           - NODE_ENV: production
 -        plugins:
 -          - auth: /var/vcap/packages/kibana-auth-plugin/kibana-auth-plugin.zip
 -        source_files:
 -          - /var/vcap/jobs/kibana-auth-plugin/config/config.sh
 +        config_options:
 +          xpack.monitoring.enabled: false
 +          xpack.graph.enabled: false
 +          xpack.ml.enabled: false
 +          xpack.security.enabled: false
 +          xpack.watcher.enabled: false
   - name: syslog_forwarder
     release: logsearch
     consumes:
 @@ -310,8 +256,8 @@ instance_groups:
   - z1
   - z2
   instances: 2
 -  persistent_disk_type: 2GB
 -  vm_type: c3.large
 +  persistent_disk_type: 5GB
 +  vm_type: large
   stemcell: default
   networks:
   - name: default
 @@ -320,34 +266,19 @@ instance_groups:
     release: logsearch
     consumes:
       elasticsearch: {from: elasticsearch_master}
 -  - name: parser-config-lfc
 -    release: logsearch-for-cloudfoundry
   - name: ingestor_syslog
     release: logsearch
 +    consumes:
 +      elasticsearch: nil
     provides:
       ingestor: {as: ingestor_link}
     properties:
       logstash_parser:
 -        filters:
 -          - logsearch-for-cf: /var/vcap/packages/logsearch-config-logstash-filters/logstash-filters-default.conf
         elasticsearch:
 -          index: logs-%{[@metadata][index]}-%{+YYYY.MM.dd}
 +          data_hosts:
 +          - 127.0.0.1
         deployment_dictionary:
           - /var/vcap/packages/logsearch-config/deployment_lookup.yml
 -          - /var/vcap/jobs/parser-config-lfc/config/deployment_lookup.yml
 -  - name: ingestor_cloudfoundry-firehose
 -    release: logsearch-for-cloudfoundry
 -    consumes:
 -      cloud_controller: {from: cloud_controller, deployment: cf}
 -      ingestor: {from: ingestor_link}
 -    properties:
 -      cloudfoundry:
 -        firehose_client_id: firehose-to-syslog
 -        firehose_client_secret: "((firehose_client_secret))"
 -        skip_ssl_validation: true
 -      create-uaa-client:
 -        cloudfoundry:
 -          uaa_admin_client_secret: "((uaa_admin_client_secret))"
   - name: syslog_forwarder
     release: logsearch
     consumes:
 @@ -363,15 +294,11 @@ instance_groups:
           service: ingestor
         - file: /var/vcap/sys/log/ingestor_syslog/ingestor_syslog.stderr.log
           service: ingestor
 -        - file: /var/vcap/sys/log/ingestor_cloudfoundry-firehose/ingestor_cloudfoundry-firehose.stdout.log
 -          service: ingestor_cloudfoundry-firehose
 -        - file: /var/vcap/sys/log/ingestor_cloudfoundry-firehose/ingestor_cloudfoundry-firehose.stderr.log
 -          service: ingestor_cloudfoundry-firehose
 - name: ls-router
   azs:
   - z1
   instances: 1
 -  vm_type: m3.medium
 +  vm_type: medium
   stemcell: default
   networks:
   - name: default
 @@ -383,35 +310,16 @@ instance_groups:
       ingestor: {from: ingestor_link}
       kibana: {from: kibana_link}
       syslog_forwarder: {from: cluster_monitor}
 -  - name: route_registrar
 -    release: logsearch-for-cloudfoundry
 -    consumes:
 -      nats: {from: nats, deployment: cf}
 -    properties:
 -      route_registrar:
 -        routes:
 -        - name: kibana
 -          port: 80
 -          registration_interval: 60s
 -          uris:
 -          - "logs.((system_domain))"
 -
 -variables:
 -- name: kibana_oauth2_client_secret
 -  type: password
 -- name: firehose_client_secret
 -  type: password
 
 releases:
 - name: logsearch
 -  url: https://bosh.io/d/github.com/cloudfoundry-community/logsearch-boshrelease?v=208.0.0
 -  version: 208.0.0
 -  sha1: 578283fd9d8dbbd02e7f4f35e6d60671953a924f
 -- name: logsearch-for-cloudfoundry
 -  url: https://bosh.io/d/github.com/cloudfoundry-community/logsearch-for-cloudfoundry?v=206.0.0
 -  version: 206.0.0
 -  sha1: 574720bed4d453ed4153f48d5244e2b4fde16354
 +  url: https://s3.amazonaws.com/logsearch/logsearch-210.2.0.tgz
 +  version: 210.2.0
 +  sha1: 22950f2288ba8a44a45bd579aebb9f6abe23ed06
 +
 stemcells:
 - alias: default
 -  os: ubuntu-trusty
 -  version: "3541.latest"
 +  os: ubuntu-xenial
 +  version: "latest"
 +
 +variables: []
 diff --git cloud.gov/deployment/operations/README.md cloudfoundry-community/deployment/operations/README.md
 new file mode 100644
 index 0000000..8346e32
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/README.md
 @@ -0,0 +1,37 @@
 +# OPS Files for Logsearch deployment
 +There are a couple of OPS files that would be helpful for your deployments. Please read a short description for each of them. 
 +
 +## scale-to-one-az.yml
 +Intended to use for learning purposes. It significantly decreases a number of used  VM's by scaling down to single Availability Zone. Additionaly, it allows to be store data on Master node, which is usually not recommended. Please do not use that in production!
 +
 +## aws-lb.yml
 +Registers `ls-router` VMs on AWS Load Balancer. Please note, that LB is have to be created in advance. If you're using [BBL](https://github.com/cloudfoundry/bosh-bootloader) to spin up environment - you can use override files from [bbl](bbl/) directory.
 +
 +Here are example:
 +
 +```
 +$ bbl plan --lb-type concourse
 +
 +$ cp -r <logsearch-boshrelease path>/deployment/operations/bbl/* .
 +
 +$ bbl up
 +
 +$ bosh upload-stemcell https://bosh.io/d/stemcells/bosh-aws-xen-hvm-ubuntu-trusty-go_agent
 +
 +$ cd <logsearch-boshrelease path>/deployment
 +
 +$ bosh -d logsearch deploy logsearch-deployment.yml -o operations/aws-lb.yml
 +```
 +
 +## cloudfoundry.yml
 +Includes [logsearch-for-cloudfoundry](https://github.com/cloudfoundry-community/logsearch-for-cloudfoundry) release. It allows to fetch application logs from CloudFoundry deployment via Firehose interface. 
 +
 +To use this extention, you have to provide following variables: `cf_admin_password`, `uaa_admin_client_secret` and `system_domain`. You can find them in your CloudFoundry deployment variables.
 +
 +After deployment, please run `create-uaa-client` errand to create UAA client. After that, you will be able to login into Logsearch UI using your CloudFoundry credentials, and use `https://logs.<YOUR_DOMAIN>` endpoint to access Logsearch UI.
 +
 +## cf-kibana.yml
 +Errand to push Kibana application into CloudFoundry as an alternative to running it as a separate job.
 +
 +- Depend from **cloudfoundry.yml**
 +- Requires `cf-kibana_client_secre` variable
 \ No newline at end of file
 diff --git cloud.gov/deployment/operations/archiver-syslog.yml cloudfoundry-community/deployment/operations/archiver-syslog.yml
 index 507c72f..629dadd 100644
 --- cloud.gov/deployment/operations/archiver-syslog.yml
 +++ cloudfoundry-community/deployment/operations/archiver-syslog.yml
 @@ -27,8 +27,6 @@
       - name: archiver_syslog
         release: logsearch
         properties:
 -          logstash_archiver:
 -            files: 16384
           logstash_ingestor:
             outputs:
               - plugin: s3
 diff --git cloud.gov/deployment/operations/aws-lb.yml cloudfoundry-community/deployment/operations/aws-lb.yml
 new file mode 100644
 index 0000000..60c5440
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/aws-lb.yml
 @@ -0,0 +1,3 @@
 +- type: replace
 +  path: /instance_groups/name=ls-router/vm_extensions?/-
 +  value: lb-logsearch
 diff --git cloud.gov/deployment/operations/bbl/cloud-config/logsearch-lb.yml cloudfoundry-community/deployment/operations/bbl/cloud-config/logsearch-lb.yml
 new file mode 100644
 index 0000000..3fdc7b4
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/bbl/cloud-config/logsearch-lb.yml
 @@ -0,0 +1,14 @@
 +- type: replace
 +  path: /vm_extensions/-
 +  value:
 +    name: lb-logsearch
 +    cloud_properties:
 +      lb_target_groups:
 +      - logsearch80
 +      - logsearch8080
 +      - logsearch5514
 +      - logsearch6514
 +      - logsearch2514
 +      security_groups:
 +      - ((internal_security_group))
 +      - logsearch-lb-security-group
 diff --git cloud.gov/deployment/operations/bbl/terraform/logsearch-lb.tf cloudfoundry-community/deployment/operations/bbl/terraform/logsearch-lb.tf
 new file mode 100644
 index 0000000..1589f97
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/bbl/terraform/logsearch-lb.tf
 @@ -0,0 +1,202 @@
 +# Load Balancer
 +resource "aws_lb" "logsearch_lb" {
 +  name               = "${var.short_env_id}-logsearch-lb"
 +  load_balancer_type = "network"
 +  subnets            = ["${aws_subnet.lb_subnets.*.id}"]
 +}
 +
 +# Listener for Kibana
 +resource "aws_lb_listener" "logsearch_lb_80" {
 +  load_balancer_arn = "${aws_lb.logsearch_lb.arn}"
 +  protocol          = "TCP"
 +  port              = 80
 +
 +  default_action {
 +    type             = "forward"
 +    target_group_arn = "${aws_lb_target_group.logsearch_lb_80.arn}"
 +  }
 +}
 +
 +resource "aws_lb_target_group" "logsearch_lb_80" {
 +  name     = "logsearch80"
 +  port     = 80
 +  protocol = "TCP"
 +  vpc_id   = "${local.vpc_id}"
 +
 +  health_check {
 +    healthy_threshold   = 10
 +    unhealthy_threshold = 10
 +    interval            = 30
 +    protocol            = "TCP"
 +  }
 +}
 +
 +# Listener for Cluster Monitor
 +resource "aws_lb_listener" "logsearch_lb_8080" {
 +  load_balancer_arn = "${aws_lb.logsearch_lb.arn}"
 +  protocol          = "TCP"
 +  port              = 8080
 +
 +  default_action {
 +    type             = "forward"
 +    target_group_arn = "${aws_lb_target_group.logsearch_lb_8080.arn}"
 +  }
 +}
 +
 +resource "aws_lb_target_group" "logsearch_lb_8080" {
 +  name     = "logsearch8080"
 +  port     = 8080
 +  protocol = "TCP"
 +  vpc_id   = "${local.vpc_id}"
 +
 +  health_check {
 +    healthy_threshold   = 10
 +    unhealthy_threshold = 10
 +    interval            = 30
 +    protocol            = "TCP"
 +  }
 +}
 +
 +# Listener for Ingestor
 +resource "aws_lb_listener" "logsearch_lb_5514" {
 +  load_balancer_arn = "${aws_lb.logsearch_lb.arn}"
 +  protocol          = "TCP"
 +  port              = 5514
 +
 +  default_action {
 +    type             = "forward"
 +    target_group_arn = "${aws_lb_target_group.logsearch_lb_5514.arn}"
 +  }
 +}
 +
 +resource "aws_lb_target_group" "logsearch_lb_5514" {
 +  name     = "logsearch5514"
 +  port     = 5514
 +  protocol = "TCP"
 +  vpc_id   = "${local.vpc_id}"
 +
 +  health_check {
 +    healthy_threshold   = 10
 +    unhealthy_threshold = 10
 +    interval            = 30
 +    protocol            = "TCP"
 +  }
 +}
 +
 +# Listener for Ingestor TLS
 +resource "aws_lb_listener" "logsearch_lb_6514" {
 +  load_balancer_arn = "${aws_lb.logsearch_lb.arn}"
 +  protocol          = "TCP"
 +  port              = 6514
 +
 +  default_action {
 +    type             = "forward"
 +    target_group_arn = "${aws_lb_target_group.logsearch_lb_6514.arn}"
 +  }
 +}
 +
 +resource "aws_lb_target_group" "logsearch_lb_6514" {
 +  name     = "logsearch6514"
 +  port     = 6514
 +  protocol = "TCP"
 +  vpc_id   = "${local.vpc_id}"
 +
 +  health_check {
 +    healthy_threshold   = 10
 +    unhealthy_threshold = 10
 +    interval            = 30
 +    protocol            = "TCP"
 +  }
 +}
 +
 +# Listener for RELP
 +resource "aws_lb_listener" "logsearch_lb_2514" {
 +  load_balancer_arn = "${aws_lb.logsearch_lb.arn}"
 +  protocol          = "TCP"
 +  port              = 2514
 +
 +  default_action {
 +    type             = "forward"
 +    target_group_arn = "${aws_lb_target_group.logsearch_lb_2514.arn}"
 +  }
 +}
 +
 +resource "aws_lb_target_group" "logsearch_lb_2514" {
 +  name     = "logsearch2514"
 +  port     = 2514
 +  protocol = "TCP"
 +  vpc_id   = "${local.vpc_id}"
 +
 +  health_check {
 +    healthy_threshold   = 10
 +    unhealthy_threshold = 10
 +    interval            = 30
 +    protocol            = "TCP"
 +  }
 +}
 +
 +# Security group
 +resource "aws_security_group" "logsearch_lb_security_group" {
 +  name        = "logsearch-lb-security-group"
 +  description = "Logsearch"
 +  vpc_id      = "${local.vpc_id}"
 +
 +  tags {
 +    Name = "${var.env_id}-logsearch-lb-internal-security-group"
 +  }
 +
 +  lifecycle {
 +    ignore_changes = ["name"]
 +  }
 +}
 +
 +# Security rules
 +resource "aws_security_group_rule" "logsearch_lb_80" {
 +  type        = "ingress"
 +  protocol    = "tcp"
 +  from_port   = 80
 +  to_port     = 80
 +  cidr_blocks = ["0.0.0.0/0"]
 +
 +  security_group_id = "${aws_security_group.logsearch_lb_security_group.id}"
 +}
 +
 +resource "aws_security_group_rule" "logsearch_lb_8080" {
 +  type        = "ingress"
 +  protocol    = "tcp"
 +  from_port   = 8080
 +  to_port     = 8080
 +  cidr_blocks = ["0.0.0.0/0"]
 +
 +  security_group_id = "${aws_security_group.logsearch_lb_security_group.id}"
 +}
 +
 +resource "aws_security_group_rule" "logsearch_lb_5514" {
 +  type        = "ingress"
 +  protocol    = "tcp"
 +  from_port   = 5514
 +  to_port     = 5514
 +  cidr_blocks = ["0.0.0.0/0"]
 +
 +  security_group_id = "${aws_security_group.logsearch_lb_security_group.id}"
 +}
 +
 +resource "aws_security_group_rule" "logsearch_lb_6514" {
 +  type        = "ingress"
 +  protocol    = "tcp"
 +  from_port   = 6514
 +  to_port     = 6514
 +  cidr_blocks = ["0.0.0.0/0"]
 +
 +  security_group_id = "${aws_security_group.logsearch_lb_security_group.id}"
 +}
 +
 +resource "aws_security_group_rule" "logsearch_lb_2514" {
 +  type        = "ingress"
 +  protocol    = "tcp"
 +  from_port   = 2514
 +  to_port     = 2514
 +  cidr_blocks = ["0.0.0.0/0"]
 +
 +  security_group_id = "${aws_security_group.logsearch_lb_security_group.id}"
 +}
 diff --git cloud.gov/deployment/operations/cf-kibana.yml cloudfoundry-community/deployment/operations/cf-kibana.yml
 new file mode 100644
 index 0000000..af950cc
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/cf-kibana.yml
 @@ -0,0 +1,28 @@
 +---
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/-
 +  value:
 +    name: cf-kibana
 +    release: logsearch-for-cloudfoundry
 +    lifecycle: errand
 +    consumes:
 +      elasticsearch: {from: elasticsearch_master}
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +    properties:
 +      cloudfoundry:
 +        admin_password: "((cf_admin_password))"
 +      cf-kibana:
 +        app_name: kibana
 +        app_memory: 4G
 +        oauth2_client_secret: "((cf-kibana_client_secret))"
 +        cloudfoundry:
 +          uaa_admin_client_secret: "((uaa_admin_client_secret))"
 +          api_security_group: public_networks
 +          system_org: system
 +          apps_domain: ((system_domain))
 +        config_options:
 +          xpack.monitoring.enabled: false
 +          xpack.graph.enabled: false
 +          xpack.ml.enabled: false
 +          xpack.security.enabled: false
 +          xpack.watcher.enabled: false
 \ No newline at end of file
 diff --git cloud.gov/deployment/operations/cf/add-firehose-to-syslog-uaa-clients.yml cloudfoundry-community/deployment/operations/cf/add-firehose-to-syslog-uaa-clients.yml
 new file mode 100644
 index 0000000..e138fba
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/cf/add-firehose-to-syslog-uaa-clients.yml
 @@ -0,0 +1,16 @@
 +# Apply to your cf-deployment based Cloud Foundry
 +
 +# UAA client for firehose-to-syslog
 +- type: replace
 +  path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/clients/firehose-to-syslog?
 +  value:
 +    override: true
 +    authorized-grant-types: client_credentials
 +    authorities: doppler.firehose,cloud_controller.global_auditor
 +    secret: "((uaa_clients_firehose_to_syslog_secret))"
 +
 +- type: replace
 +  path: /variables/-
 +  value:
 +    name: uaa_clients_firehose_to_syslog_secret
 +    type: password
 diff --git cloud.gov/deployment/operations/cf/add-kibana-uaa-clients.yml cloudfoundry-community/deployment/operations/cf/add-kibana-uaa-clients.yml
 new file mode 100644
 index 0000000..bb95a6a
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/cf/add-kibana-uaa-clients.yml
 @@ -0,0 +1,19 @@
 +# Apply to your cf-deployment based Cloud Foundry
 +
 +# UAA client for Kibana
 +- type: replace
 +  path: /instance_groups/name=uaa/jobs/name=uaa/properties/uaa/clients/kibana?
 +  value:
 +    authorities: uaa.none
 +    authorized-grant-types: authorization_code,refresh_token
 +    autoapprove: true
 +    override: true
 +    redirect-uri: "((kibana_redirect_uri))"
 +    scope: openid,oauth.approvals,scim.userids,cloud_controller.read
 +    secret: "((uaa_clients_kibana_secret))"
 +
 +- type: replace
 +  path: /variables/-
 +  value:
 +    name: uaa_clients_kibana_secret
 +    type: password
 diff --git cloud.gov/deployment/operations/change-azs.yml cloudfoundry-community/deployment/operations/change-azs.yml
 new file mode 100644
 index 0000000..cee021c
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/change-azs.yml
 @@ -0,0 +1,29 @@
 +---
 +# Availability zones
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_master/azs
 +  value: ((azs))
 +
 +- type: replace
 +  path: /instance_groups/name=cluster_monitor/azs
 +  value: ((azs))
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/azs
 +  value: ((azs))
 +
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_data/azs
 +  value: ((azs))
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/azs
 +  value: ((azs))
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/azs
 +  value: ((azs))
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/azs
 +  value: ((azs))
 diff --git cloud.gov/deployment/operations/change-cf-deployment-name.yml cloudfoundry-community/deployment/operations/change-cf-deployment-name.yml
 new file mode 100644
 index 0000000..86ce5bd
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/change-cf-deployment-name.yml
 @@ -0,0 +1,24 @@
 +---
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=create-uaa-client/consumes/cloud_controller/deployment?
 +  value: ((cf_deployment_name))
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=smoke-tests/consumes/cloud_controller/deployment?
 +  value: ((cf_deployment_name))
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=upload-kibana-objects/consumes/cloud_controller/deployment?
 +  value: ((cf_deployment_name))
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_cloudfoundry-firehose/consumes/cloud_controller/deployment?
 +  value: ((cf_deployment_name))
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/jobs/name=kibana-auth-plugin/consumes/cloud_controller/deployment?
 +  value: ((cf_deployment_name))
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/jobs/name=route_registrar/consumes/nats/deployment?
 +  value: ((cf_deployment_name))
 diff --git cloud.gov/deployment/operations/change-disk-types.yml cloudfoundry-community/deployment/operations/change-disk-types.yml
 new file mode 100644
 index 0000000..88bb4c7
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/change-disk-types.yml
 @@ -0,0 +1,21 @@
 +---
 +# Persistent disk types
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_master/persistent_disk_type
 +  value: ((elasticsearch_master_disk_type))
 +
 +- type: replace
 +  path: /instance_groups/name=cluster_monitor/persistent_disk_type
 +  value: ((cluster_monitor_disk_type))
 +
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_data/persistent_disk_type
 +  value: ((elasticsearch_data_disk_type))
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/persistent_disk_type
 +  value: ((kibana_disk_type))
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/persistent_disk_type
 +  value: ((ingestor_disk_type))
 diff --git cloud.gov/deployment/operations/change-kibana-route.yml cloudfoundry-community/deployment/operations/change-kibana-route.yml
 new file mode 100644
 index 0000000..8d91295
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/change-kibana-route.yml
 @@ -0,0 +1,7 @@
 +- type: replace
 +  path: /instance_groups/name=ls-router/jobs/name=route_registrar/properties/route_registrar/routes/name=kibana/uris?
 +  value: ["((kibana_route)).((system_domain))"]
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=create-uaa-client/properties/create-uaa-client/kibana_host?
 +  value: "((kibana_route))"
 diff --git cloud.gov/deployment/operations/change-vm-types.yml cloudfoundry-community/deployment/operations/change-vm-types.yml
 new file mode 100644
 index 0000000..b092879
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/change-vm-types.yml
 @@ -0,0 +1,29 @@
 +---
 +# VM types
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_master/vm_type
 +  value: ((elasticsearch_master_vm_type))
 +
 +- type: replace
 +  path: /instance_groups/name=cluster_monitor/vm_type
 +  value: ((cluster_monitor_vm_type))
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/vm_type
 +  value: ((maintenance_vm_type))
 +
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_data/vm_type
 +  value: ((elasticsearch_data_vm_type))
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/vm_type
 +  value: ((kibana_vm_type))
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/vm_type
 +  value: ((ingestor_vm_type))
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/vm_type
 +  value: ((ls_router_vm_type))
 diff --git cloud.gov/deployment/operations/cloudfoundry.yml cloudfoundry-community/deployment/operations/cloudfoundry.yml
 new file mode 100644
 index 0000000..02aa456
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/cloudfoundry.yml
 @@ -0,0 +1,204 @@
 +---
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/-
 +  value:
 +    name: create-uaa-client
 +    release: logsearch-for-cloudfoundry
 +    consumes:
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +    properties:
 +      create-uaa-client:
 +        cloudfoundry:
 +          uaa_admin_client_secret: "((uaa_admin_client_secret))"
 +        oauth2_client_secret: "((kibana_oauth2_client_secret))"
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=smoke_tests
 +  value:
 +    name: smoke-tests
 +    release: logsearch-for-cloudfoundry
 +    consumes:
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +      elasticsearch: {from: elasticsearch_master}
 +    properties:
 +      smoke_tests:
 +        admin_password: "((cf_admin_password))"
 +        elasticsearch_master:
 +          app_index: 'logs-app-{{.Org}}-{{.Space}}-{{.Time.Format \"2006.01.02\"}}'
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/-
 +  value:
 +    name: upload-kibana-objects
 +    release: logsearch-for-cloudfoundry
 +    consumes:
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +      elasticsearch: {from: elasticsearch_master}
 +    properties:
 +      cloudfoundry:
 +        user: admin
 +        password: "((cf_admin_password))"
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_syslog/properties/logstash_parser/elasticsearch?/index?
 +  value: logs-%{[@metadata][index]}-%{+YYYY.MM.dd}
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=elasticsearch_config/properties/elasticsearch_config/templates/-
 +  value:
 +    index-mappings-lfc: /var/vcap/jobs/elasticsearch-config-lfc/index-mappings.json
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=elasticsearch_config/properties/elasticsearch_config/templates/-
 +  value:
 +    index-mappings-app-lfc: /var/vcap/jobs/elasticsearch-config-lfc/index-mappings-app.json
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/name=elasticsearch_config/properties/elasticsearch_config/templates/-
 +  value:
 +    index-mappings-platform-lfc: /var/vcap/jobs/elasticsearch-config-lfc/index-mappings-platform.json
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/jobs/-
 +  value:
 +    name: elasticsearch-config-lfc
 +    release: logsearch-for-cloudfoundry
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/-
 +  value:
 +    name: parser-config-lfc
 +    release: logsearch-for-cloudfoundry
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_syslog/properties/logstash_parser/deployment_dictionary/-
 +  value:
 +    /var/vcap/jobs/parser-config-lfc/config/deployment_lookup.yml
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_syslog/properties/logstash_parser/filters?
 +  value:
 +  - logsearch-for-cf: /var/vcap/packages/logsearch-config-logstash-filters/logstash-filters-default.conf
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/-
 +  value:
 +    name: ingestor_cloudfoundry-firehose
 +    release: logsearch-for-cloudfoundry
 +    consumes:
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +      ingestor: {from: ingestor_link}
 +    properties:
 +      cloudfoundry:
 +        firehose_client_id: firehose-to-syslog
 +        firehose_client_secret: "((firehose_client_secret))"
 +        skip_ssl_validation: true
 +      create-uaa-client:
 +        cloudfoundry:
 +          uaa_admin_client_secret: "((uaa_admin_client_secret))"
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=syslog_forwarder/properties/syslog_forwarder/config/-
 +  value:
 +    file: /var/vcap/sys/log/ingestor_cloudfoundry-firehose/ingestor_cloudfoundry-firehose.stdout.log
 +    service: ingestor_cloudfoundry-firehose
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=syslog_forwarder/properties/syslog_forwarder/config/-
 +  value:
 +    file: /var/vcap/sys/log/ingestor_cloudfoundry-firehose/ingestor_cloudfoundry-firehose.stderr.log
 +    service: ingestor_cloudfoundry-firehose
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/jobs/-
 +  value:
 +    name: redis
 +    release: logsearch-for-cloudfoundry
 +    provides:
 +      redis: {as: redis_link}
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/jobs/-
 +  value:
 +    name: kibana-auth-plugin
 +    release: logsearch-for-cloudfoundry
 +    consumes:
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +      kibana: {from: kibana_link}
 +      redis: {from: redis_link}
 +    properties:
 +      kibana-auth:
 +        cloudfoundry:
 +          client_secret: "((kibana_oauth2_client_secret))"
 +          skip_ssl_validation: true
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/jobs/-
 +  value:
 +    name: bpm
 +    release: bpm
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/jobs/-
 +  value:
 +    name: route_registrar
 +    release: routing
 +    consumes:
 +      nats:
 +        from: nats
 +        deployment: cf
 +    properties:
 +      route_registrar:
 +        routes:
 +        - name: kibana
 +          port: 80
 +          registration_interval: 60s
 +          uris:
 +          - "logs.((system_domain))"
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/jobs/name=kibana/properties/kibana/plugins?
 +  value:
 +  - auth: /var/vcap/packages/kibana-auth-plugin/kibana-auth-plugin.zip
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/jobs/name=kibana/properties/kibana/source_files?
 +  value:
 +  - /var/vcap/jobs/kibana-auth-plugin/config/config.sh
 +
 +- type: replace
 +  path: /variables/-
 +  value:
 +   name: kibana_oauth2_client_secret
 +   type: password
 +
 +- type: replace
 +  path: /variables/-
 +  value:
 +    name: firehose_client_secret
 +    type: password
 +
 +# Releases
 +- type: replace
 +  path: /releases/-
 +  value:
 +    name: bpm
 +    version: 1.0.4
 +    url: https://bosh.io/d/github.com/cloudfoundry-incubator/bpm-release?v=1.0.4
 +    sha1: 41df19697d6a69d2552bc2c132928157fa91abe0
 +
 +- type: replace
 +  path: /releases/-
 +  value:
 +    name: routing
 +    version: 0.188.0
 +    url: https://bosh.io/d/github.com/cloudfoundry-incubator/cf-routing-release?v=0.188.0
 +    sha1: d3420851c470790e8980ff0c506f75e3e52c15d9
 +
 +- type: replace
 +  path: /releases/-
 +  value:
 +    name: logsearch-for-cloudfoundry
 +    url: https://s3.amazonaws.com/logsearch-for-cloudfoundry/logsearch-for-cloudfoundry-210.2.0.tgz
 +    version: 210.2.0
 +    sha1: d3adbefc42f30b2aac0c9fc12b610fbc7b5caeea
 diff --git cloud.gov/deployment/operations/firehose-subscription-id.yml cloudfoundry-community/deployment/operations/firehose-subscription-id.yml
 new file mode 100644
 index 0000000..f7a986c
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/firehose-subscription-id.yml
 @@ -0,0 +1,3 @@
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_cloudfoundry-firehose/properties/cloudfoundry/firehose_subscription_id?
 +  value: ((firehose_subscription_id))
 diff --git cloud.gov/deployment/operations/ingestor-forward-to-elasticsearch-data.yml cloudfoundry-community/deployment/operations/ingestor-forward-to-elasticsearch-data.yml
 new file mode 100644
 index 0000000..8f77bf4
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/ingestor-forward-to-elasticsearch-data.yml
 @@ -0,0 +1,22 @@
 +- type: replace
 +  path: /instance_groups/name=cluster_monitor/jobs/name=ingestor_syslog/consumes?
 +  value:
 +    elasticsearch: nil
 +
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_data/jobs/name=elasticsearch/provides?
 +  value:
 +    elasticsearch:
 +      as: elasticsearch_data
 +
 +- type: remove
 +  path: /instance_groups/name=ingestor/jobs/name=elasticsearch
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_syslog/consumes?
 +  value:
 +    elasticsearch:
 +      from: elasticsearch_data
 +
 +- type: remove
 +  path: /instance_groups/name=ingestor/jobs/name=ingestor_syslog/properties?/logstash_parser?/elasticsearch?/data_hosts?
 diff --git cloud.gov/deployment/operations/push-cloudfoundry-kibana.yml cloudfoundry-community/deployment/operations/push-cloudfoundry-kibana.yml
 index 116d009..7b89bea 100644
 --- cloud.gov/deployment/operations/push-cloudfoundry-kibana.yml
 +++ cloudfoundry-community/deployment/operations/push-cloudfoundry-kibana.yml
 @@ -5,38 +5,26 @@
   path: /instance_groups/name=ls-router
 
 - type: replace
 -  path: /instance_groups/name=create-uaa-client
 +  path: /instance_groups/name=maintenance/jobs/-
   value:
     name: cf-kibana
 -    lifecycle: errand
 -    azs: [z1]
 -    instances: 1
 -    vm_type: m3.medium
 -    stemcell: default
 -    update:
 -      max_in_flight: 1
 -      serial: true
 -    networks:
 -    - name: default
 -    jobs:
 -    - name: cf-kibana
 -      release: logsearch-for-cloudfoundry
 -      consumes:
 -        elasticsearch: {from: elasticsearch_master}
 -        cloud_controller: {from: cloud_controller, deployment: cf}
 -        redis: {from: redis_link}
 -      properties:
 +    release: logsearch-for-cloudfoundry
 +    consumes:
 +      elasticsearch: {from: elasticsearch_master}
 +      cloud_controller: {from: cloud_controller, deployment: cf}
 +      redis: {from: redis_link}
 +    properties:
 +      cloudfoundry:
 +        admin_password: "((cf_admin_password))"
 +      cf-kibana:
 +        cloudfoundry:
 +          api_security_group: "((api_security_group))"
 +          uaa_admin_client_secret: "((uaa_admin_client_secret))"
 +        oauth2_client_secret: "((kibana_oauth2_client_secret))"
 +      create-uaa-client:
         cloudfoundry:
 -          admin_password: "((cf_admin_password))"
 -        cf-kibana:
 -          cloudfoundry:
 -            api_security_group: "((api_security_group))"
 -            uaa_admin_client_secret: "((uaa_admin_client_secret))"
 -          oauth2_client_secret: "((kibana_oauth2_client_secret))"
 -        create-uaa-client:
 -          cloudfoundry:
 -            uaa_admin_client_secret: "((uaa_admin_client_secret))"
 -          oauth2_client_secret: "((kibana_oauth2_client_secret))"
 +          uaa_admin_client_secret: "((uaa_admin_client_secret))"
 +        oauth2_client_secret: "((kibana_oauth2_client_secret))"
 
 - type: replace
   path: /instance_groups/-
 diff --git cloud.gov/deployment/operations/remove-cluster-monitor.yml cloudfoundry-community/deployment/operations/remove-cluster-monitor.yml
 new file mode 100644
 index 0000000..2bea730
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/remove-cluster-monitor.yml
 @@ -0,0 +1,23 @@
 +---
 +# Remove Cluster Monitor
 +- type: remove
 +  path: /instance_groups/name=cluster_monitor
 +
 +- type: remove
 +  path: /instance_groups/name=elasticsearch_master/jobs/name=syslog_forwarder
 +
 +- type: remove
 +  path: /instance_groups/name=maintenance/jobs/name=syslog_forwarder
 +
 +- type: remove
 +  path: /instance_groups/name=elasticsearch_data/jobs/name=syslog_forwarder
 +
 +- type: remove
 +  path: /instance_groups/name=kibana/jobs/name=syslog_forwarder
 +
 +- type: remove
 +  path: /instance_groups/name=ingestor/jobs/name=syslog_forwarder
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/jobs/name=haproxy/consumes/syslog_forwarder
 +  value: nil
 diff --git cloud.gov/deployment/operations/rename-network.yml cloudfoundry-community/deployment/operations/rename-network.yml
 new file mode 100644
 index 0000000..547a5e2
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/rename-network.yml
 @@ -0,0 +1,29 @@
 +---
 +# Network name
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_master/networks/name=default/name
 +  value: ((network_name))
 +
 +- type: replace
 +  path: /instance_groups/name=cluster_monitor/networks/name=default/name
 +  value: ((network_name))
 +
 +- type: replace
 +  path: /instance_groups/name=maintenance/networks/name=default/name
 +  value: ((network_name))
 +
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_data/networks/name=default/name
 +  value: ((network_name))
 +
 +- type: replace
 +  path: /instance_groups/name=kibana/networks/name=default/name
 +  value: ((network_name))
 +
 +- type: replace
 +  path: /instance_groups/name=ingestor/networks/name=default/name
 +  value: ((network_name))
 +
 +- type: replace
 +  path: /instance_groups/name=ls-router/networks/name=default/name
 +  value: ((network_name))
 diff --git cloud.gov/deployment/operations/scale-to-one-az.yml cloudfoundry-community/deployment/operations/scale-to-one-az.yml
 index 7e97749..6aa4474 100644
 --- cloud.gov/deployment/operations/scale-to-one-az.yml
 +++ cloudfoundry-community/deployment/operations/scale-to-one-az.yml
 @@ -18,3 +18,7 @@
 - type: replace
   path: /instance_groups/name=ingestor/azs
   value: [ z1 ]
 +
 +- type: replace
 +  path: /instance_groups/name=elasticsearch_master/jobs/name=elasticsearch/properties/elasticsearch/node/allow_data?
 +  value: true
 diff --git cloud.gov/deployment/operations/use-latest-release.yml cloudfoundry-community/deployment/operations/use-latest-release.yml
 new file mode 100644
 index 0000000..f5e2899
 --- /dev/null
 +++ cloudfoundry-community/deployment/operations/use-latest-release.yml
 @@ -0,0 +1,19 @@
 +- type: replace
 +  path: /releases/name=logsearch/version
 +  value: latest
 +
 +- type: remove
 +  path: /releases/name=logsearch/url
 +
 +- type: remove
 +  path: /releases/name=logsearch/sha1
 +
 +- type: replace
 +  path: /releases/name=logsearch-for-cloudfoundry/version
 +  value: latest
 +
 +- type: remove
 +  path: /releases/name=logsearch-for-cloudfoundry/url
 +
 +- type: remove
 +  path: /releases/name=logsearch-for-cloudfoundry/sha1
 \ No newline at end of file
 diff --git cloud.gov/jobs/archiver_syslog/spec cloudfoundry-community/jobs/archiver_syslog/spec
 index b68e74c..a69cee9 100644
 --- cloud.gov/jobs/archiver_syslog/spec
 +++ cloudfoundry-community/jobs/archiver_syslog/spec
 @@ -4,12 +4,11 @@ name: archiver_syslog
 packages:
 - logstash
 - logsearch-config
 -- java8
 +- openjdk-8
 
 templates:
   bin/archiver_syslog_ctl: bin/archiver_syslog_ctl
   bin/monit_debugger: bin/monit_debugger
 -  bin/post-start.erb: bin/post-start
   config/input_and_output.conf.erb: config/input_and_output.conf
   config/syslog_tls.crt.erb: config/syslog_tls.crt
   config/syslog_tls.key.erb: config/syslog_tls.key
 @@ -91,16 +90,6 @@ properties:
     description: Transport protocol to use
     default: "tcp"
 
 -  logstash_ingestor.health.disable_post_start:
 -    description: Allow node to run post-start script? (true / false)
 -    default: false
 -  logstash_ingestor.health.interval:
 -    description: Logstash syslog health check interval (seconds)
 -    default: 5
 -  logstash_ingestor.health.timeout:
 -    description: Logstash syslog health check number of attempts (seconds)
 -    default: 300
 -
   logstash_ingestor.syslog_tls.port:
     description: Port to listen for syslog-TLS messages (omit to disable)
   logstash_ingestor.syslog_tls.ssl_cert:
 @@ -118,7 +107,3 @@ properties:
   logstash_ingestor.outputs:
     description: A list of output plugins, with a hash of options for each of them.
     default: []
 -
 -  logstash_archiver.files:
 -    description: Number of files open which the system ulimit settings allow
 -    default: 4096
 diff --git cloud.gov/jobs/archiver_syslog/templates/bin/post-start.erb cloudfoundry-community/jobs/archiver_syslog/templates/bin/post-start.erb
 deleted file mode 100644
 index 4a001cb..0000000
 --- cloud.gov/jobs/archiver_syslog/templates/bin/post-start.erb
 +++ /dev/null
 @@ -1,23 +0,0 @@
 -#!/bin/bash
 -
 -set -e
 -
 -<% if !p("logstash_ingestor.health.disable_post_start") %>
 -
 -echo "Waiting <%= p("logstash_ingestor.health.timeout") %>s for syslog to accept connections..."
 -elapsed=0
 -until [ $elapsed -ge <%= p("logstash_ingestor.health.timeout") %> ]
 -do
 -  nc -vz localhost <%= p("logstash_ingestor.syslog.port") %> 2>&1 && break
 -  elapsed=$[$elapsed+<%= p("logstash_ingestor.health.interval") %>]
 -  sleep <%= p("logstash_ingestor.health.interval") %>
 -done
 -
 -if [ "$elapsed" -ge "<%= p("logstash_ingestor.health.timeout") %>" ]; then
 -  echo "ERROR: Cannot connect to syslog. Exiting..."
 -  exit 1
 -fi
 -
 -<% end %>
 -
 -exit 0
 diff --git cloud.gov/jobs/archiver_syslog/templates/helpers/ctl_setup.sh cloudfoundry-community/jobs/archiver_syslog/templates/helpers/ctl_setup.sh
 index dca5b52..fb99b87 100644
 --- cloud.gov/jobs/archiver_syslog/templates/helpers/ctl_setup.sh
 +++ cloudfoundry-community/jobs/archiver_syslog/templates/helpers/ctl_setup.sh
 @@ -65,10 +65,7 @@ then
   export PYTHONPATH=$WEBAPP_DIR/vendor/lib/python
 fi
 
 -if [[ -d /var/vcap/packages/java8 ]]
 -then
 -  export JAVA_HOME="/var/vcap/packages/java8"
 -fi
 +source /var/vcap/packages/openjdk-8/bosh/runtime.env
 
 PIDFILE=$RUN_DIR/$JOB_NAME.pid
 
 diff --git cloud.gov/jobs/cerebro/spec cloudfoundry-community/jobs/cerebro/spec
 index 4d2d342..4f9228f 100644
 --- cloud.gov/jobs/cerebro/spec
 +++ cloudfoundry-community/jobs/cerebro/spec
 @@ -3,7 +3,8 @@ name: cerebro
 
 packages:
 - cerebro
 -- java8
 +- openjdk-8
 +
 
 templates:
   bin/cerebro_ctl: bin/cerebro_ctl
 diff --git cloud.gov/jobs/cerebro/templates/config/application.conf.erb cloudfoundry-community/jobs/cerebro/templates/config/application.conf.erb
 index 58a6934..cc89338 100644
 --- cloud.gov/jobs/cerebro/templates/config/application.conf.erb
 +++ cloudfoundry-community/jobs/cerebro/templates/config/application.conf.erb
 @@ -14,6 +14,11 @@ data.path = "/var/vcap/store/cerebro/cerebro.db"
 # To avoid creating a PID file set this value to /dev/null
 pidfile.path = "/dev/null"
 
 +# Enable gzip when requesting data from es
 +es = {
 +  gzip = true
 +}
 +
 <%
   cluster_name = nil
   if_link("elasticsearch") { |elasticsearch_link| cluster_name = elasticsearch_link.p("elasticsearch.cluster_name") }
 diff --git cloud.gov/jobs/cerebro/templates/helpers/ctl_setup.sh cloudfoundry-community/jobs/cerebro/templates/helpers/ctl_setup.sh
 index daee730..d27c2b0 100644
 --- cloud.gov/jobs/cerebro/templates/helpers/ctl_setup.sh
 +++ cloudfoundry-community/jobs/cerebro/templates/helpers/ctl_setup.sh
 @@ -77,10 +77,7 @@ then
   export PYTHONPATH=$WEBAPP_DIR/vendor/lib/python
 fi
 
 -if [[ -d /var/vcap/packages/java8 ]]
 -then
 -  export JAVA_HOME="/var/vcap/packages/java8"
 -fi
 +source /var/vcap/packages/openjdk-8/bosh/runtime.env
 
 # setup CLASSPATH for all jars/ folders within packages
 export CLASSPATH=${CLASSPATH:-''} # default to empty
 diff --git cloud.gov/jobs/curator/monit cloudfoundry-community/jobs/curator/monit
 index 04e4f9f..e69de29 100644
 --- cloud.gov/jobs/curator/monit
 +++ cloudfoundry-community/jobs/curator/monit
 @@ -1,5 +0,0 @@
 -check process curator with pidfile "/var/vcap/sys/run/curator/curator.pid"
 - start program "/var/vcap/jobs/curator/bin/curator_ctl start"
 - stop program "/var/vcap/jobs/curator/bin/curator_ctl stop"
 - group vcap
 -
 diff --git cloud.gov/jobs/curator/spec cloudfoundry-community/jobs/curator/spec
 index d528a37..1364547 100644
 --- cloud.gov/jobs/curator/spec
 +++ cloudfoundry-community/jobs/curator/spec
 @@ -6,14 +6,10 @@ packages:
   - python3
 
 templates:
 -  bin/curator_ctl: bin/curator_ctl
 +  bin/pre-start: bin/pre-start
   bin/run-curator: bin/run-curator
   config/actions.yml.erb: config/actions.yml
   config/config.yml.erb: config/config.yml
 -  config/purge_logs.cron: config/purge_logs.cron
 -  data/properties.sh.erb: data/properties.sh
 -  helpers/ctl_setup.sh: helpers/ctl_setup.sh
 -  helpers/ctl_utils.sh: helpers/ctl_utils.sh
 
 consumes:
  - name: elasticsearch
 @@ -34,6 +30,16 @@ properties:
     description: Bucket name on S3 where to keep snapshots
     default: ''
 
 +  curator.execute.hourly:
 +    description: "Execute Curator hourly?"
 +    default: true
 +  curator.execute.daily:
 +    description: "Execute Curator daily?"
 +    default: false
 +  curator.execute.weekly:
 +    description: "Execute Curator weekly?"
 +    default: false
 +
   curator.elasticsearch.hosts:
     description: IP address of elasticsearch host to proxy requests for (eg, 127.0.0.1)
     default:
 @@ -50,9 +56,6 @@ properties:
   curator.loglevel:
     description: Set the minimum acceptable log severity to display.
     default: INFO
 -  curator.cron_schedule:
 -    description: Schedule to trigger Curator, using normal cron format
 -    default: 0 0 * * *
   curator.logformat:
     description: This should default, json, logstash.
     default: default
 diff --git cloud.gov/jobs/curator/templates/bin/curator_ctl cloudfoundry-community/jobs/curator/templates/bin/curator_ctl
 deleted file mode 100644
 index 997e363..0000000
 --- cloud.gov/jobs/curator/templates/bin/curator_ctl
 +++ /dev/null
 @@ -1,37 +0,0 @@
 -#!/bin/bash
 -
 -set -e
 -set -u
 -set -x
 -
 -CRON_STATUS=`pgrep cron | wc -l`
 -
 -source /var/vcap/jobs/curator/helpers/ctl_setup.sh 'curator'
 -
 -case $1 in
 -  start)
 -    if [ $CRON_STATUS -eq 0 ]; then
 -      /usr/sbin/cron start
 -    fi
 -
 -    (crontab -l | sed /run/d; cat /var/vcap/jobs/curator/config/purge_logs.cron) | sed /^$/d | crontab
 -
 -    pgrep cron > /var/vcap/sys/run/curator/curator.pid
 -    ;;
 -  stop)
 -
 -    if [ -z "$(crontab -l | grep -v 'run')" ]; then
 -      crontab -r
 -    else
 -      (crontab -l | sed /run/d) | sed /^$/d | crontab
 -    fi
 -
 -
 -    rm -f /var/vcap/sys/run/curator/curator.pid
 -
 -    ;;
 -  *)
 -    echo "Usage: curator_ctl {start|stop}"
 -    ;;
 -
 -esac
 diff --git cloud.gov/jobs/curator/templates/bin/pre-start cloudfoundry-community/jobs/curator/templates/bin/pre-start
 new file mode 100644
 index 0000000..895974e
 --- /dev/null
 +++ cloudfoundry-community/jobs/curator/templates/bin/pre-start
 @@ -0,0 +1,27 @@
 +#!/usr/bin/env bash
 +
 +set -eu
 +
 +<% if p('curator.execute.hourly') %>
 +# Execute Curator hourly
 +cp /var/vcap/jobs/curator/bin/run-curator /etc/cron.hourly
 +<% else %>
 +# Remove pre-existing hourly script
 +rm -f /etc/cron.hourly/run-curator
 +<% end %>
 +
 +<% if p('curator.execute.daily') %>
 +# Execute Curator daily
 +cp /var/vcap/jobs/curator/bin/run-curator /etc/cron.daily
 +<% else %>
 +# Remove pre-existing daily script
 +rm -f /etc/cron.daily/run-curator
 +<% end %>
 +
 +<% if p('curator.execute.weekly') %>
 +# Execute curator weekly
 +cp /var/vcap/jobs/curator/bin/run-curator /etc/cron.weekly
 +<% else %>
 +# Remove pre-existing weekly script
 +rm -f /etc/cron.weekly/run-curator
 +<% end %>
 diff --git cloud.gov/jobs/curator/templates/bin/run-curator cloudfoundry-community/jobs/curator/templates/bin/run-curator
 index e8e3b4a..ba93d0f 100644
 --- cloud.gov/jobs/curator/templates/bin/run-curator
 +++ cloudfoundry-community/jobs/curator/templates/bin/run-curator
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/usr/bin/env bash
 
 set -e
 
 diff --git cloud.gov/jobs/curator/templates/config/purge_logs.cron cloudfoundry-community/jobs/curator/templates/config/purge_logs.cron
 deleted file mode 100644
 index 057588d..0000000
 --- cloud.gov/jobs/curator/templates/config/purge_logs.cron
 +++ /dev/null
 @@ -1 +0,0 @@
 -<%= p('curator.cron_schedule') %> /var/vcap/jobs/curator/bin/run-curator >>/var/vcap/sys/log/curator/curator.log 2>&1
 diff --git cloud.gov/jobs/curator/templates/data/properties.sh.erb cloudfoundry-community/jobs/curator/templates/data/properties.sh.erb
 deleted file mode 100644
 index 616aecc..0000000
 --- cloud.gov/jobs/curator/templates/data/properties.sh.erb
 +++ /dev/null
 @@ -1,10 +0,0 @@
 -#!/usr/bin/env bash
 -
 -# job template binding variables
 -
 -# job name & index of this VM within cluster
 -# e.g. JOB_NAME=redis, JOB_INDEX=0
 -export NAME='<%= name %>'
 -export JOB_INDEX=<%= index %>
 -# full job name, like redis/0 or webapp/3
 -export JOB_FULL="$NAME/$JOB_INDEX"
 diff --git cloud.gov/jobs/curator/templates/helpers/ctl_setup.sh cloudfoundry-community/jobs/curator/templates/helpers/ctl_setup.sh
 deleted file mode 100755
 index 9cb3d1b..0000000
 --- cloud.gov/jobs/curator/templates/helpers/ctl_setup.sh
 +++ /dev/null
 @@ -1,74 +0,0 @@
 -#!/usr/bin/env bash
 -
 -# Setup env vars and folders for the ctl script
 -# This helps keep the ctl script as readable
 -# as possible
 -
 -# Usage options:
 -# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh JOB_NAME OUTPUT_LABEL
 -# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar
 -# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar foobar
 -# source /var/vcap/jobs/foobar/helpers/ctl_setup.sh foobar nginx
 -
 -set -e # exit immediately if a simple command exits with a non-zero status
 -set -u # report the usage of uninitialized variables
 -
 -JOB_NAME=$1
 -output_label=${1:-JOB_NAME}
 -
 -export JOB_DIR=/var/vcap/jobs/$JOB_NAME
 -chmod 755 $JOB_DIR # to access file via symlink
 -
 -# Load some bosh deployment properties into env vars
 -# Try to put all ERb into data/properties.sh.erb
 -# incl $NAME, $JOB_INDEX, $WEBAPP_DIR
 -source $JOB_DIR/data/properties.sh
 -
 -source $JOB_DIR/helpers/ctl_utils.sh
 -redirect_output ${output_label}
 -
 -export HOME=${HOME:-/home/vcap}
 -
 -# Add all packages' /bin & /sbin into $PATH
 -for package_bin_dir in $(ls -d /var/vcap/packages/*/*bin)
 -do
 -  export PATH=${package_bin_dir}:$PATH
 -done
 -
 -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-''} # default to empty
 -for package_bin_dir in $(ls -d /var/vcap/packages/*/lib)
 -do
 -  export LD_LIBRARY_PATH=${package_bin_dir}:$LD_LIBRARY_PATH
 -done
 -
 -# Setup log, run and tmp folders
 -
 -export RUN_DIR=/var/vcap/sys/run/$JOB_NAME
 -export LOG_DIR=/var/vcap/sys/log/$JOB_NAME
 -export TMP_DIR=/var/vcap/sys/tmp/$JOB_NAME
 -export STORE_DIR=/var/vcap/store/$JOB_NAME
 -for dir in $RUN_DIR $LOG_DIR $TMP_DIR $STORE_DIR
 -do
 -  mkdir -p ${dir}
 -  chown vcap:vcap ${dir}
 -  chmod 775 ${dir}
 -done
 -export TMPDIR=$TMP_DIR
 -
 -export C_INCLUDE_PATH=/var/vcap/packages/mysqlclient/include/mysql:/var/vcap/packages/sqlite/include:/var/vcap/packages/libpq/include
 -export LIBRARY_PATH=/var/vcap/packages/mysqlclient/lib/mysql:/var/vcap/packages/sqlite/lib:/var/vcap/packages/libpq/lib
 -
 -# consistent place for vendoring python libraries within package
 -if [[ -d ${WEBAPP_DIR:-/xxxx} ]]
 -then
 -  export PYTHONPATH=$WEBAPP_DIR/vendor/lib/python
 -fi
 -
 -if [[ -d /var/vcap/packages/java8 ]]
 -then
 -  export JAVA_HOME="/var/vcap/packages/java8"
 -fi
 -
 -export PIDFILE=$RUN_DIR/$JOB_NAME.pid
 -
 -echo '$PATH' $PATH
 diff --git cloud.gov/jobs/curator/templates/helpers/ctl_utils.sh cloudfoundry-community/jobs/curator/templates/helpers/ctl_utils.sh
 deleted file mode 100755
 index f55e8cb..0000000
 --- cloud.gov/jobs/curator/templates/helpers/ctl_utils.sh
 +++ /dev/null
 @@ -1,123 +0,0 @@
 -# Helper functions used by ctl scripts
 -
 -# If loaded within monit ctl scripts then pipe output
 -# If loaded from 'source ../utils.sh' then normal STDOUT
 -redirect_output() {
 -  SCRIPT=$1
 -  mkdir -p /var/vcap/sys/log/monit
 -  exec 1>> /var/vcap/sys/log/monit/$SCRIPT.log
 -  exec 2>> /var/vcap/sys/log/monit/$SCRIPT.err.log
 -}
 -
 -pid_guard() {
 -  pidfile=$1
 -  name=$2
 -
 -  if [ -f "$pidfile" ]; then
 -    pid=$(head -1 "$pidfile")
 -
 -    if [ -n "$pid" ] && [ -e /proc/$pid ]; then
 -      echo "$name is already running, please stop it first"
 -      exit 1
 -    fi
 -
 -    echo "Removing stale pidfile..."
 -    rm $pidfile
 -  fi
 -}
 -
 -wait_pid() {
 -  pid=$1
 -  try_kill=$2
 -  timeout=${3:-0}
 -  force=${4:-0}
 -  countdown=$(( $timeout * 10 ))
 -
 -  echo wait_pid $pid $try_kill $timeout $force $countdown
 -  if [ -e /proc/$pid ]; then
 -    if [ "$try_kill" = "1" ]; then
 -      echo "Killing $pidfile: $pid "
 -      kill $pid
 -    fi
 -    while [ -e /proc/$pid ]; do
 -      sleep 0.1
 -      [ "$countdown" != '0' -a $(( $countdown % 10 )) = '0' ] && echo -n .
 -      if [ $timeout -gt 0 ]; then
 -        if [ $countdown -eq 0 ]; then
 -          if [ "$force" = "1" ]; then
 -            echo -ne "\nKill timed out, using kill -9 on $pid... "
 -            kill -9 $pid
 -            sleep 0.5
 -          fi
 -          break
 -        else
 -          countdown=$(( $countdown - 1 ))
 -        fi
 -      fi
 -    done
 -    if [ -e /proc/$pid ]; then
 -      echo "Timed Out"
 -    else
 -      echo "Stopped"
 -    fi
 -  else
 -    echo "Process $pid is not running"
 -    echo "Attempting to kill pid anyway..."
 -    kill $pid
 -  fi
 -}
 -
 -wait_pidfile() {
 -  pidfile=$1
 -  try_kill=$2
 -  timeout=${3:-0}
 -  force=${4:-0}
 -  countdown=$(( $timeout * 10 ))
 -
 -  if [ -f "$pidfile" ]; then
 -    pid=$(head -1 "$pidfile")
 -    if [ -z "$pid" ]; then
 -      echo "Unable to get pid from $pidfile"
 -      exit 1
 -    fi
 -
 -    wait_pid $pid $try_kill $timeout $force
 -
 -    rm -f $pidfile
 -  else
 -    echo "Pidfile $pidfile doesn't exist"
 -  fi
 -}
 -
 -kill_and_wait() {
 -  pidfile=$1
 -  # Monit default timeout for start/stop is 30s
 -  # Append 'with timeout {n} seconds' to monit start/stop program configs
 -  timeout=${2:-25}
 -  force=${3:-1}
 -  if [[ -f ${pidfile} ]]
 -  then
 -    wait_pidfile $pidfile 1 $timeout $force
 -  else
 -    # TODO assume $1 is something to grep from 'ps ax'
 -    pid="$(ps auwwx | grep "$1" | awk '{print $2}')"
 -    wait_pid $pid 1 $timeout $force
 -  fi
 -}
 -
 -check_nfs_mount() {
 -  opts=$1
 -  exports=$2
 -  mount_point=$3
 -
 -  if grep -qs $mount_point /proc/mounts; then
 -    echo "Found NFS mount $mount_point"
 -  else
 -    echo "Mounting NFS..."
 -    mount $opts $exports $mount_point
 -    if [ $? != 0 ]; then
 -      echo "Cannot mount NFS from $exports to $mount_point, exiting..."
 -      exit 1
 -    fi
 -  fi
 -}
 diff --git cloud.gov/jobs/elasticsearch/spec cloudfoundry-community/jobs/elasticsearch/spec
 index 344c117..1443767 100644
 --- cloud.gov/jobs/elasticsearch/spec
 +++ cloudfoundry-community/jobs/elasticsearch/spec
 @@ -3,7 +3,7 @@ name: elasticsearch
 
 packages:
   - elasticsearch
 -  - java8
 +  - openjdk-8
 
 templates:
   bin/drain.erb: bin/drain
 @@ -49,6 +49,9 @@ properties:
     default: []
   elasticsearch.heap_size:
     description: sets jvm heap sized
 +  elasticsearch.heap_percentage:
 +    description: The percentage value used in the calculation to set the heap size.
 +    default: 46
   elasticsearch.path_repo:
     description: |
       Shared file system to store snapshots.
 diff --git cloud.gov/jobs/elasticsearch/templates/bin/drain.erb cloudfoundry-community/jobs/elasticsearch/templates/bin/drain.erb
 index c469dfa..8012c96 100755
 --- cloud.gov/jobs/elasticsearch/templates/bin/drain.erb
 +++ cloudfoundry-community/jobs/elasticsearch/templates/bin/drain.erb
 @@ -5,7 +5,8 @@ set -e
 <% if p('elasticsearch.node.allow_data') %>
 # disable allocations before bringing down data nodes
 
 -curl -H 'Content-Type: application/json' -s -X PUT localhost:9200/_all/_settings \
 +curl -s -X PUT localhost:9200/_all/_settings \
 +  -H 'Content-Type: application/json' \
   -d '{"settings": {"index.unassigned.node_left.delayed_timeout": "<%= p("elasticsearch.recovery.delay_allocation_restart") %>"}}' \
   > /dev/null
 
 diff --git cloud.gov/jobs/elasticsearch/templates/bin/elasticsearch_ctl cloudfoundry-community/jobs/elasticsearch/templates/bin/elasticsearch_ctl
 index 762f879..a1e69d9 100755
 --- cloud.gov/jobs/elasticsearch/templates/bin/elasticsearch_ctl
 +++ cloudfoundry-community/jobs/elasticsearch/templates/bin/elasticsearch_ctl
 @@ -13,8 +13,7 @@ export LANG=en_US.UTF-8
 export <%= k %>=<%= v %>
 <% end %>
 
 -export HEAP_SIZE=$((( $( cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ) * 46 ) / 100 ))K
 -
 +export HEAP_SIZE=$((( $( cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ) * <%= p("elasticsearch.heap_percentage") %> ) / 100 ))K
 <% if_p('elasticsearch.heap_size') do |heap_size| %>
   HEAP_SIZE=<%= heap_size %>
 <% end %>
 diff --git cloud.gov/jobs/elasticsearch/templates/bin/post-deploy.erb cloudfoundry-community/jobs/elasticsearch/templates/bin/post-deploy.erb
 index 21d6115..7177ee8 100755
 --- cloud.gov/jobs/elasticsearch/templates/bin/post-deploy.erb
 +++ cloudfoundry-community/jobs/elasticsearch/templates/bin/post-deploy.erb
 @@ -3,11 +3,13 @@
 set -e
 
 <% if p('elasticsearch.cloud.aws.bucket') != '' and p('elasticsearch.node.allow_master') and spec.bootstrap %>
 -curl -H 'Content-Type: application/json' -X PUT -s localhost:9200/_snapshot/<%= p('elasticsearch.snapshots.repository') %> \
 +curl -X PUT -s localhost:9200/_snapshot/<%= p('elasticsearch.snapshots.repository') %> \
 +  -H 'Content-Type: application/json' \
   -d '{"type": "s3", "settings": {"bucket": "<%= p('elasticsearch.cloud.aws.bucket') %>"}}'
 <% end %>
 
 <% if p('elasticsearch.path_repo') != '' and p('elasticsearch.node.allow_master') and spec.bootstrap %>
 -curl -H 'Content-Type: application/json' -X PUT -s localhost:9200/_snapshot/<%= p('elasticsearch.snapshots.repository') %> \
 +curl -X PUT -s localhost:9200/_snapshot/<%= p('elasticsearch.snapshots.repository') %> \
 +  -H 'Content-Type: application/json' \
   -d '{"type": "fs", "settings": {"location": "<%= p('elasticsearch.path_repo') %>/<%= p('elasticsearch.snapshots.repository') %>", "compress": true}}'
 <% end %>
 diff --git cloud.gov/jobs/elasticsearch/templates/bin/post-start.erb cloudfoundry-community/jobs/elasticsearch/templates/bin/post-start.erb
 index a6f2c57..56bed2d 100755
 --- cloud.gov/jobs/elasticsearch/templates/bin/post-start.erb
 +++ cloudfoundry-community/jobs/elasticsearch/templates/bin/post-start.erb
 @@ -47,9 +47,10 @@ done
 rm ${out}
 
 <% if p("elasticsearch.node.allow_data") %>
 -curl -H 'Content-Type: application/json' -X PUT -s localhost:9200/_all/_settings \
 +curl -X PUT -s localhost:9200/_all/_settings \
 +  -H 'Content-Type: application/json' \
   -d '{"settings": {"index.unassigned.node_left.delayed_timeout": "<%= p("elasticsearch.recovery.delay_allocation") %>"}}'
 -<% end %>
 +<% end %> 
 
 if [ "${remaining}" -le 0 ]; then
   echo "Node failed to join the cluster"
 diff --git cloud.gov/jobs/elasticsearch/templates/config/config.yml.erb cloudfoundry-community/jobs/elasticsearch/templates/config/config.yml.erb
 index 2b43549..46382bf 100644
 --- cloud.gov/jobs/elasticsearch/templates/config/config.yml.erb
 +++ cloudfoundry-community/jobs/elasticsearch/templates/config/config.yml.erb
 @@ -1,7 +1,7 @@
 bootstrap.memory_lock: true
 
 path.logs: "/var/vcap/sys/log/elasticsearch"
 -path.data: "/var/vcap/store/elasticsearch/logsearch"
 +path.data: "/var/vcap/store/elasticsearch"
 <% if p('elasticsearch.path_repo') != '' %>
 path.repo: ["<%= p('elasticsearch.path_repo') %>"]
 <% end %>
 @@ -64,11 +64,6 @@ cloud:
     <% if_p('elasticsearch.cloud.aws.region') do |region| %>region: <%= region %><% end %>
 <% end %>
 
 -# disable xpack
 -xpack.monitoring.enabled: false
 -xpack.graph.enabled: false
 -xpack.ml.enabled: false
 -xpack.security.enabled: false
 -xpack.watcher.enabled: false
 -
 -<% if_p('elasticsearch.config_options') do | v | %><%= v %><% end %>
 +<% if_p('elasticsearch.config_options') do p("elasticsearch.config_options", {}).each do | k, v | %>
 +<%= k %>: <%= v %><% end %>
 +<% end %>
 diff --git cloud.gov/jobs/elasticsearch/templates/helpers/ctl_setup.sh cloudfoundry-community/jobs/elasticsearch/templates/helpers/ctl_setup.sh
 index 6eae355..5a50994 100644
 --- cloud.gov/jobs/elasticsearch/templates/helpers/ctl_setup.sh
 +++ cloudfoundry-community/jobs/elasticsearch/templates/helpers/ctl_setup.sh
 @@ -68,10 +68,7 @@ then
   export PYTHONPATH=$WEBAPP_DIR/vendor/lib/python
 fi
 
 -if [[ -d /var/vcap/packages/java8 ]]
 -then
 -  export JAVA_HOME="/var/vcap/packages/java8"
 -fi
 +source /var/vcap/packages/openjdk-8/bosh/runtime.env
 
 export PIDFILE=$RUN_DIR/$JOB_NAME.pid
 
 diff --git cloud.gov/jobs/elasticsearch_config/spec cloudfoundry-community/jobs/elasticsearch_config/spec
 index 88a4087..dbe6d3c 100644
 --- cloud.gov/jobs/elasticsearch_config/spec
 +++ cloudfoundry-community/jobs/elasticsearch_config/spec
 @@ -3,10 +3,10 @@ name: elasticsearch_config
 
 packages:
   - elasticsearch
 -  - java8
 +  - openjdk-8
 
 templates:
 -  bin/run.erb: bin/run
 +  bin/run.erb: bin/upload-config
   bin/job.process: bin/job.process
   index-templates/shards-and-replicas.json.erb: index-templates/shards-and-replicas.json
   index-templates/index-settings.json.erb: index-templates/index-settings.json
 diff --git cloud.gov/jobs/elasticsearch_config/templates/bin/job.process cloudfoundry-community/jobs/elasticsearch_config/templates/bin/job.process
 index e685430..e62e2c7 100755
 --- cloud.gov/jobs/elasticsearch_config/templates/bin/job.process
 +++ cloudfoundry-community/jobs/elasticsearch_config/templates/bin/job.process
 @@ -20,7 +20,7 @@ case $1 in
   start)
     echo $$ > "${PIDFILE}"
 
 -    /var/vcap/jobs/elasticsearch_config/bin/run
 +    /var/vcap/jobs/elasticsearch_config/bin/upload-config
 
     # pretend we're still running to keep monit happy
     echo 1 > "${PIDFILE}"
 @@ -39,4 +39,4 @@ case $1 in
 
     ;;
 
 -esac
 \ No newline at end of file
 +esac
 diff --git cloud.gov/jobs/ingestor_syslog/spec cloudfoundry-community/jobs/ingestor_syslog/spec
 index da7e985..f3a8d05 100644
 --- cloud.gov/jobs/ingestor_syslog/spec
 +++ cloudfoundry-community/jobs/ingestor_syslog/spec
 @@ -4,12 +4,11 @@ name: ingestor_syslog
 packages:
 - logstash
 - logsearch-config
 -- java8
 +- openjdk-8
 
 templates:
   bin/ingestor_syslog_ctl: bin/ingestor_syslog_ctl
   bin/monit_debugger: bin/monit_debugger
 -  bin/post-start.erb: bin/post-start
   config/input_and_output.conf.erb: config/input_and_output.conf
   config/filters_pre.conf.erb: config/filters_pre.conf
   config/filters_post.conf.erb: config/filters_post.conf
 @@ -30,10 +29,22 @@ provides:
   - logstash_ingestor.syslog.transport
   - logstash_ingestor.syslog_tls.port
   - logstash_ingestor.relp.port
 +- name: syslog_forwarder
 +  type: syslog_forwarder
 +  properties:
 +  - logstash_ingestor.syslog.port
 +
 +consumes:
 +- name: elasticsearch
 +  type: elasticsearch
 +  optional: true
 
 properties:
   logstash.heap_size:
     description: sets jvm heap sized
 +  logstash.heap_percentage:
 +    description: The percentage value used in the calculation to set the heap size.
 +    default: 46
   logstash.jvm_options:
     description: additional jvm options
     default: []
 @@ -85,16 +96,6 @@ properties:
     description: Transport protocol to use
     default: "tcp"
 
 -  logstash_ingestor.health.disable_post_start:
 -    description: Allow node to run post-start script? (true / false)
 -    default: false
 -  logstash_ingestor.health.interval:
 -    description: Logstash syslog health check interval (seconds)
 -    default: 5
 -  logstash_ingestor.health.timeout:
 -    description: Logstash syslog health check number of attempts (seconds)
 -    default: 300
 -
   logstash_ingestor.syslog_tls.port:
     description: Port to listen for syslog-TLS messages (omit to disable)
   logstash_ingestor.syslog_tls.ssl_cert:
 @@ -160,7 +161,6 @@ properties:
     description: "The routing to be used when indexing a document."
   logstash_parser.elasticsearch.data_hosts:
     description: The list of elasticsearch data node IPs
 -    default: [127.0.0.1]
   logstash_parser.timecop.reject_greater_than_hours:
     description: "Logs with timestamps greater than this many hours in the future won't be parsed and will get tagged with fail/timecop"
     default: 1
 diff --git cloud.gov/jobs/ingestor_syslog/templates/bin/ingestor_syslog_ctl cloudfoundry-community/jobs/ingestor_syslog/templates/bin/ingestor_syslog_ctl
 index 9da4a08..2430cf6 100644
 --- cloud.gov/jobs/ingestor_syslog/templates/bin/ingestor_syslog_ctl
 +++ cloudfoundry-community/jobs/ingestor_syslog/templates/bin/ingestor_syslog_ctl
 @@ -6,9 +6,17 @@ set -u # report the usage of uninitialized variables
 # Setup env vars and folders for the webapp_ctl script
 source /var/vcap/jobs/ingestor_syslog/helpers/ctl_setup.sh 'ingestor_syslog'
 
 +<%
 +  es_host = nil
 +  if_p("logstash_parser.elasticsearch.data_hosts") { |hosts| es_host = hosts.first }
 +  unless es_host
 +    es_host =  link("elasticsearch").instances.first.address
 +  end
 +%>
 +
 function wait_for_template {
   local template_name="$1"
 -  local MASTER_URL="<%= p("logstash_parser.elasticsearch.data_hosts").first %>:9200"
 +  local MASTER_URL="<%= es_host %>:9200"
 
   set +e
   while true;  do
 @@ -31,7 +39,7 @@ export LOGSTASH_WORKERS=<%= p('logstash_parser.workers') %>
 <% end %>
 export TIMECOP_REJECT_GREATER_THAN_HOURS=<%= p('logstash_parser.timecop.reject_greater_than_hours') %>
 export TIMECOP_REJECT_LESS_THAN_HOURS=<%= p('logstash_parser.timecop.reject_less_than_hours') %>
 -export HEAP_SIZE=$((( $( cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ) * 46 ) / 100 ))K
 +export HEAP_SIZE=$((( $( cat /proc/meminfo | grep MemTotal | awk '{ print $2 }' ) * <%= p("logstash.heap_percentage") %> ) / 100 ))K
 <% if_p('logstash.heap_size') do |heap_size| %>
 HEAP_SIZE=<%= heap_size %>
 <% end %>
 @@ -94,9 +102,10 @@ case $1 in
     echo "} #close filters" >> ${JOB_DIR}/config/logstash.conf
 
     # clear persistent queue if the upgrade failed last run
 -    if tail -8 $LOG_DIR/$JOB_NAME.stdout.log | grep 'QueueUpgrade - Logstash was unable to upgrade your persistent queue data' >/dev/null ; then
 +    if cat $LOG_DIR/$JOB_NAME.stdout.log | grep -a 'QueueUpgrade - Logstash was unable to upgrade your persistent queue data' >/dev/null ; then
       mkdir ${STORE_DIR}/oldqueue.$$
       mv ${STORE_DIR}/queue ${STORE_DIR}/.lock ${STORE_DIR}/dead_letter_queue ${STORE_DIR}/uuid ${STORE_DIR}/oldqueue.$$
 +      mv $LOG_DIR/$JOB_NAME.stdout.log $LOG_DIR/$JOB_NAME.stdout.log.old
     fi
 
     exec chpst -u vcap:vcap /var/vcap/packages/logstash/bin/logstash \
 diff --git cloud.gov/jobs/ingestor_syslog/templates/bin/post-start.erb cloudfoundry-community/jobs/ingestor_syslog/templates/bin/post-start.erb
 deleted file mode 100644
 index 4a001cb..0000000
 --- cloud.gov/jobs/ingestor_syslog/templates/bin/post-start.erb
 +++ /dev/null
 @@ -1,23 +0,0 @@
 -#!/bin/bash
 -
 -set -e
 -
 -<% if !p("logstash_ingestor.health.disable_post_start") %>
 -
 -echo "Waiting <%= p("logstash_ingestor.health.timeout") %>s for syslog to accept connections..."
 -elapsed=0
 -until [ $elapsed -ge <%= p("logstash_ingestor.health.timeout") %> ]
 -do
 -  nc -vz localhost <%= p("logstash_ingestor.syslog.port") %> 2>&1 && break
 -  elapsed=$[$elapsed+<%= p("logstash_ingestor.health.interval") %>]
 -  sleep <%= p("logstash_ingestor.health.interval") %>
 -done
 -
 -if [ "$elapsed" -ge "<%= p("logstash_ingestor.health.timeout") %>" ]; then
 -  echo "ERROR: Cannot connect to syslog. Exiting..."
 -  exit 1
 -fi
 -
 -<% end %>
 -
 -exit 0
 diff --git cloud.gov/jobs/ingestor_syslog/templates/config/input_and_output.conf.erb cloudfoundry-community/jobs/ingestor_syslog/templates/config/input_and_output.conf.erb
 index 2029d21..e39f449 100644
 --- cloud.gov/jobs/ingestor_syslog/templates/config/input_and_output.conf.erb
 +++ cloudfoundry-community/jobs/ingestor_syslog/templates/config/input_and_output.conf.erb
 @@ -43,6 +43,14 @@ input {
   <% end %>
 }
 
 +<%
 +  es_output_hosts = nil
 +  if_p("logstash_parser.elasticsearch.data_hosts") { |hosts| es_output_hosts = hosts.map { |ip| "#{ip}:9200" }.join(',') }
 +  unless es_output_hosts
 +    es_output_hosts =  link("elasticsearch").address
 +  end
 +%>
 +
 output {
     <% if p("logstash_parser.debug") %>
         stdout {
 @@ -55,7 +63,7 @@ output {
         <% if 'elasticsearch' == output['plugin'] %>
             <%
               options = {
 -                "hosts" => [ p('logstash_parser.elasticsearch.data_hosts').map { |ip| "#{ip}:9200" }.join(',') ],
 +                "hosts" => [ es_output_hosts ],
                 "index" => p('logstash_parser.elasticsearch.index'),
                 "manage_template" => false
               }
 diff --git cloud.gov/jobs/ingestor_syslog/templates/helpers/ctl_setup.sh cloudfoundry-community/jobs/ingestor_syslog/templates/helpers/ctl_setup.sh
 index dca5b52..fb99b87 100644
 --- cloud.gov/jobs/ingestor_syslog/templates/helpers/ctl_setup.sh
 +++ cloudfoundry-community/jobs/ingestor_syslog/templates/helpers/ctl_setup.sh
 @@ -65,10 +65,7 @@ then
   export PYTHONPATH=$WEBAPP_DIR/vendor/lib/python
 fi
 
 -if [[ -d /var/vcap/packages/java8 ]]
 -then
 -  export JAVA_HOME="/var/vcap/packages/java8"
 -fi
 +source /var/vcap/packages/openjdk-8/bosh/runtime.env
 
 PIDFILE=$RUN_DIR/$JOB_NAME.pid
 
 diff --git cloud.gov/jobs/kibana/spec cloudfoundry-community/jobs/kibana/spec
 index f1ac753..17b7cfa 100644
 --- cloud.gov/jobs/kibana/spec
 +++ cloudfoundry-community/jobs/kibana/spec
 @@ -58,15 +58,6 @@ properties:
   kibana.console_enabled:
     description: "Enable Kibana development console; should be set to `false` in a multi-tenant deployment."
     default: false
 -  kibana.searchprofiler_enabled:
 -    description: "Enable Kibana development search profiler; should be set to `false` in a multi-tenant deployment."
 -    default: false
 -  kibana.grokdebugger_enabled:
 -    description: "Enable Kibana development grok debugger; should be set to `false` in a multi-tenant deployment."
 -    default: false
 -  kibana.apm_enabled:
 -    description: "Enable Kibana APM ui; should be set to `false` in a multi-tenant deployment."
 -    default: false
   kibana.config_options:
     description: "Additional options to append to kibana's config.yml (YAML format)."
     default: ~
 diff --git cloud.gov/jobs/kibana/templates/bin/kibana_ctl cloudfoundry-community/jobs/kibana/templates/bin/kibana_ctl
 index 742ee37..d43d8e5 100755
 --- cloud.gov/jobs/kibana/templates/bin/kibana_ctl
 +++ cloudfoundry-community/jobs/kibana/templates/bin/kibana_ctl
 @@ -17,18 +17,315 @@ export PIDFILE=/var/vcap/sys/run/kibana/kibana.pid
 function wait_for_template {
   local template_name="$1"
   local MASTER_URL="<%= p("kibana.elasticsearch.host") %>:<%= elasticsearch_port %>"
 +  local wait=0
 
   set +e
   while true;  do
     echo "Waiting for index template to be uploaded: $template_name"
 -    curl -X HEAD -f -i "$MASTER_URL"/_template/$template_name > /dev/null 2>&1
 -    [ $? ] && break
 -    sleep 5
 +    curl -f -I "$MASTER_URL"/_template/$template_name > /dev/null 2>&1 && break
 +    if [ $wait -gt 120 ]; then
 +      echo $template_name not found
 +      exit 1
 +    fi
 +    let wait+=10
 +    sleep 10
   done
   echo "Found $template_name"
   set -e
 }
 
 +function convert_kibana_index {
 +  # do the migration as per https://www.elastic.co/guide/en/kibana/6.0/migrating-6.0-index.html#migrating-6.0-index
 +  curl -X PUT "localhost:9200/.kibana/_settings" -H 'Content-Type: application/json' -d'{"index.blocks.write": true}'
 +  curl -X PUT "localhost:9200/.kibana-6" -H 'Content-Type: application/json' -d'
 +    {
 +      "settings" : {
 +        "number_of_shards" : 1,
 +        "index.mapper.dynamic": false
 +      },
 +      "mappings" : {
 +        "doc": {
 +          "properties": {
 +            "type": {
 +              "type": "keyword"
 +            },
 +            "updated_at": {
 +              "type": "date"
 +            },
 +            "config": {
 +              "properties": {
 +                "buildNum": {
 +                  "type": "keyword"
 +                }
 +              }
 +            },
 +            "index-pattern": {
 +              "properties": {
 +                "fieldFormatMap": {
 +                  "type": "text"
 +                },
 +                "fields": {
 +                  "type": "text"
 +                },
 +                "intervalName": {
 +                  "type": "keyword"
 +                },
 +                "notExpandable": {
 +                  "type": "boolean"
 +                },
 +                "sourceFilters": {
 +                  "type": "text"
 +                },
 +                "timeFieldName": {
 +                  "type": "keyword"
 +                },
 +                "title": {
 +                  "type": "text"
 +                }
 +              }
 +            },
 +            "visualization": {
 +              "properties": {
 +                "description": {
 +                  "type": "text"
 +                },
 +                "kibanaSavedObjectMeta": {
 +                  "properties": {
 +                    "searchSourceJSON": {
 +                      "type": "text"
 +                    }
 +                  }
 +                },
 +                "savedSearchId": {
 +                  "type": "keyword"
 +                },
 +                "title": {
 +                  "type": "text"
 +                },
 +                "uiStateJSON": {
 +                  "type": "text"
 +                },
 +                "version": {
 +                  "type": "integer"
 +                },
 +                "visState": {
 +                  "type": "text"
 +                }
 +              }
 +            },
 +            "search": {
 +              "properties": {
 +                "columns": {
 +                  "type": "keyword"
 +                },
 +                "description": {
 +                  "type": "text"
 +                },
 +                "hits": {
 +                  "type": "integer"
 +                },
 +                "kibanaSavedObjectMeta": {
 +                  "properties": {
 +                    "searchSourceJSON": {
 +                      "type": "text"
 +                    }
 +                  }
 +                },
 +                "sort": {
 +                  "type": "keyword"
 +                },
 +                "title": {
 +                  "type": "text"
 +                },
 +                "version": {
 +                  "type": "integer"
 +                }
 +              }
 +            },
 +            "dashboard": {
 +              "properties": {
 +                "description": {
 +                  "type": "text"
 +                },
 +                "hits": {
 +                  "type": "integer"
 +                },
 +                "kibanaSavedObjectMeta": {
 +                  "properties": {
 +                    "searchSourceJSON": {
 +                      "type": "text"
 +                    }
 +                  }
 +                },
 +                "optionsJSON": {
 +                  "type": "text"
 +                },
 +                "panelsJSON": {
 +                  "type": "text"
 +                },
 +                "refreshInterval": {
 +                  "properties": {
 +                    "display": {
 +                      "type": "keyword"
 +                    },
 +                    "pause": {
 +                      "type": "boolean"
 +                    },
 +                    "section": {
 +                      "type": "integer"
 +                    },
 +                    "value": {
 +                      "type": "integer"
 +                    }
 +                  }
 +                },
 +                "timeFrom": {
 +                  "type": "keyword"
 +                },
 +                "timeRestore": {
 +                  "type": "boolean"
 +                },
 +                "timeTo": {
 +                  "type": "keyword"
 +                },
 +                "title": {
 +                  "type": "text"
 +                },
 +                "uiStateJSON": {
 +                  "type": "text"
 +                },
 +                "version": {
 +                  "type": "integer"
 +                }
 +              }
 +            },
 +            "url": {
 +              "properties": {
 +                "accessCount": {
 +                  "type": "long"
 +                },
 +                "accessDate": {
 +                  "type": "date"
 +                },
 +                "createDate": {
 +                  "type": "date"
 +                },
 +                "url": {
 +                  "type": "text",
 +                  "fields": {
 +                    "keyword": {
 +                      "type": "keyword",
 +                      "ignore_above": 2048
 +                    }
 +                  }
 +                }
 +              }
 +            },
 +            "server": {
 +              "properties": {
 +                "uuid": {
 +                  "type": "keyword"
 +                }
 +              }
 +            },
 +            "timelion-sheet": {
 +              "properties": {
 +                "description": {
 +                  "type": "text"
 +                },
 +                "hits": {
 +                  "type": "integer"
 +                },
 +                "kibanaSavedObjectMeta": {
 +                  "properties": {
 +                    "searchSourceJSON": {
 +                      "type": "text"
 +                    }
 +                  }
 +                },
 +                "timelion_chart_height": {
 +                  "type": "integer"
 +                },
 +                "timelion_columns": {
 +                  "type": "integer"
 +                },
 +                "timelion_interval": {
 +                  "type": "keyword"
 +                },
 +                "timelion_other_interval": {
 +                  "type": "keyword"
 +                },
 +                "timelion_rows": {
 +                  "type": "integer"
 +                },
 +                "timelion_sheet": {
 +                  "type": "text"
 +                },
 +                "title": {
 +                  "type": "text"
 +                },
 +                "version": {
 +                  "type": "integer"
 +                }
 +              }
 +            },
 +            "graph-workspace": {
 +              "properties": {
 +                "description": {
 +                  "type": "text"
 +                },
 +                "kibanaSavedObjectMeta": {
 +                  "properties": {
 +                    "searchSourceJSON": {
 +                      "type": "text"
 +                    }
 +                  }
 +                },
 +                "numLinks": {
 +                  "type": "integer"
 +                },
 +                "numVertices": {
 +                  "type": "integer"
 +                },
 +                "title": {
 +                  "type": "text"
 +                },
 +                "version": {
 +                  "type": "integer"
 +                },
 +                "wsState": {
 +                  "type": "text"
 +                }
 +              }
 +            }
 +          }
 +        }
 +      }
 +    }
 +  '
 +  curl -X POST "localhost:9200/_reindex" -H 'Content-Type: application/json' -d'
 +    {
 +      "source": {
 +        "index": ".kibana"
 +      },
 +      "dest": {
 +        "index": ".kibana-6"
 +      },
 +      "script": {
 +        "inline": "ctx._source = [ ctx._type : ctx._source ]; ctx._source.type = ctx._type; ctx._id = ctx._type + \":\" + ctx._id; ctx._type = \"doc\"; ",
 +        "lang": "painless"
 +      }
 +    }
 +  '
 +  curl -X POST "localhost:9200/_aliases" -H 'Content-Type: application/json' -d'
 +    {
 +      "actions" : [
 +        { "add":  { "index": ".kibana-6", "alias": ".kibana" } },
 +        { "remove_index": { "index": ".kibana" } }
 +      ]
 +    }
 +  '
 +}
 
 case $1 in
 
 @@ -63,6 +360,9 @@ case $1 in
       <% end %>
     <% end %>
 
 +    # convert index to new version
 +    curl -s localhost:9200/_cat/indices | awk '{print $3}'| grep .kibana-6 || convert_kibana_index
 +
     exec /var/vcap/packages/kibana/bin/kibana \
          -c $JOB_DIR/config/kibana.conf \
          >>$LOG_DIR/kibana.stdout.log \
 diff --git cloud.gov/jobs/kibana/templates/bin/post-start.erb cloudfoundry-community/jobs/kibana/templates/bin/post-start.erb
 index d199d68..e84bed7 100644
 --- cloud.gov/jobs/kibana/templates/bin/post-start.erb
 +++ cloudfoundry-community/jobs/kibana/templates/bin/post-start.erb
 @@ -18,306 +18,6 @@ if [ "$elapsed" -ge "<%= p("kibana.health.timeout") %>" ]; then
   exit 1
 fi
 
 -# convert index if it is an old version
 -# Note:  You can also just nuke .kibana with `curl -k -X DELETE http://localhost:9200/.kibana` while logged into the kibana instance and
 -#        then recreate everything with `bosh run-errand -d logsearch upload-kibana-objects`.  Though this will delete dashboards that others
 -#        have made, so be careful.  Consider doing a backup by exporting all objects first.
 -
 -if curl -s http://127.0.0.1:5602/api/status | grep 'Your Kibana index is out of date, reset it or use the X-Pack upgrade assistant' >/dev/null ; then
 -  echo "converting .kibana index to new 6.x format"
 -
 -  # do the migration as per https://www.elastic.co/guide/en/kibana/6.0/migrating-6.0-index.html#migrating-6.0-index
 -  curl -X PUT "localhost:9200/.kibana/_settings" -H 'Content-Type: application/json' -d'{"index.blocks.write": true}'
 -  curl -X PUT "localhost:9200/.kibana-6" -H 'Content-Type: application/json' -d'
 -    {
 -      "settings" : {
 -        "number_of_shards" : 1,
 -        "index.mapper.dynamic": false
 -      },
 -      "mappings" : {
 -        "doc": {
 -          "properties": {
 -            "type": {
 -              "type": "keyword"
 -            },
 -            "updated_at": {
 -              "type": "date"
 -            },
 -            "config": {
 -              "properties": {
 -                "buildNum": {
 -                  "type": "keyword"
 -                }
 -              }
 -            },
 -            "index-pattern": {
 -              "properties": {
 -                "fieldFormatMap": {
 -                  "type": "text"
 -                },
 -                "fields": {
 -                  "type": "text"
 -                },
 -                "intervalName": {
 -                  "type": "keyword"
 -                },
 -                "notExpandable": {
 -                  "type": "boolean"
 -                },
 -                "sourceFilters": {
 -                  "type": "text"
 -                },
 -                "timeFieldName": {
 -                  "type": "keyword"
 -                },
 -                "title": {
 -                  "type": "text"
 -                }
 -              }
 -            },
 -            "visualization": {
 -              "properties": {
 -                "description": {
 -                  "type": "text"
 -                },
 -                "kibanaSavedObjectMeta": {
 -                  "properties": {
 -                    "searchSourceJSON": {
 -                      "type": "text"
 -                    }
 -                  }
 -                },
 -                "savedSearchId": {
 -                  "type": "keyword"
 -                },
 -                "title": {
 -                  "type": "text"
 -                },
 -                "uiStateJSON": {
 -                  "type": "text"
 -                },
 -                "version": {
 -                  "type": "integer"
 -                },
 -                "visState": {
 -                  "type": "text"
 -                }
 -              }
 -            },
 -            "search": {
 -              "properties": {
 -                "columns": {
 -                  "type": "keyword"
 -                },
 -                "description": {
 -                  "type": "text"
 -                },
 -                "hits": {
 -                  "type": "integer"
 -                },
 -                "kibanaSavedObjectMeta": {
 -                  "properties": {
 -                    "searchSourceJSON": {
 -                      "type": "text"
 -                    }
 -                  }
 -                },
 -                "sort": {
 -                  "type": "keyword"
 -                },
 -                "title": {
 -                  "type": "text"
 -                },
 -                "version": {
 -                  "type": "integer"
 -                }
 -              }
 -            },
 -            "dashboard": {
 -              "properties": {
 -                "description": {
 -                  "type": "text"
 -                },
 -                "hits": {
 -                  "type": "integer"
 -                },
 -                "kibanaSavedObjectMeta": {
 -                  "properties": {
 -                    "searchSourceJSON": {
 -                      "type": "text"
 -                    }
 -                  }
 -                },
 -                "optionsJSON": {
 -                  "type": "text"
 -                },
 -                "panelsJSON": {
 -                  "type": "text"
 -                },
 -                "refreshInterval": {
 -                  "properties": {
 -                    "display": {
 -                      "type": "keyword"
 -                    },
 -                    "pause": {
 -                      "type": "boolean"
 -                    },
 -                    "section": {
 -                      "type": "integer"
 -                    },
 -                    "value": {
 -                      "type": "integer"
 -                    }
 -                  }
 -                },
 -                "timeFrom": {
 -                  "type": "keyword"
 -                },
 -                "timeRestore": {
 -                  "type": "boolean"
 -                },
 -                "timeTo": {
 -                  "type": "keyword"
 -                },
 -                "title": {
 -                  "type": "text"
 -                },
 -                "uiStateJSON": {
 -                  "type": "text"
 -                },
 -                "version": {
 -                  "type": "integer"
 -                }
 -              }
 -            },
 -            "url": {
 -              "properties": {
 -                "accessCount": {
 -                  "type": "long"
 -                },
 -                "accessDate": {
 -                  "type": "date"
 -                },
 -                "createDate": {
 -                  "type": "date"
 -                },
 -                "url": {
 -                  "type": "text",
 -                  "fields": {
 -                    "keyword": {
 -                      "type": "keyword",
 -                      "ignore_above": 2048
 -                    }
 -                  }
 -                }
 -              }
 -            },
 -            "server": {
 -              "properties": {
 -                "uuid": {
 -                  "type": "keyword"
 -                }
 -              }
 -            },
 -            "timelion-sheet": {
 -              "properties": {
 -                "description": {
 -                  "type": "text"
 -                },
 -                "hits": {
 -                  "type": "integer"
 -                },
 -                "kibanaSavedObjectMeta": {
 -                  "properties": {
 -                    "searchSourceJSON": {
 -                      "type": "text"
 -                    }
 -                  }
 -                },
 -                "timelion_chart_height": {
 -                  "type": "integer"
 -                },
 -                "timelion_columns": {
 -                  "type": "integer"
 -                },
 -                "timelion_interval": {
 -                  "type": "keyword"
 -                },
 -                "timelion_other_interval": {
 -                  "type": "keyword"
 -                },
 -                "timelion_rows": {
 -                  "type": "integer"
 -                },
 -                "timelion_sheet": {
 -                  "type": "text"
 -                },
 -                "title": {
 -                  "type": "text"
 -                },
 -                "version": {
 -                  "type": "integer"
 -                }
 -              }
 -            },
 -            "graph-workspace": {
 -              "properties": {
 -                "description": {
 -                  "type": "text"
 -                },
 -                "kibanaSavedObjectMeta": {
 -                  "properties": {
 -                    "searchSourceJSON": {
 -                      "type": "text"
 -                    }
 -                  }
 -                },
 -                "numLinks": {
 -                  "type": "integer"
 -                },
 -                "numVertices": {
 -                  "type": "integer"
 -                },
 -                "title": {
 -                  "type": "text"
 -                },
 -                "version": {
 -                  "type": "integer"
 -                },
 -                "wsState": {
 -                  "type": "text"
 -                }
 -              }
 -            }
 -          }
 -        }
 -      }
 -    }
 -  '
 -  curl -X POST "localhost:9200/_reindex" -H 'Content-Type: application/json' -d'
 -    {
 -      "source": {
 -        "index": ".kibana"
 -      },
 -      "dest": {
 -        "index": ".kibana-6"
 -      },
 -      "script": {
 -        "inline": "ctx._source = [ ctx._type : ctx._source ]; ctx._source.type = ctx._type; ctx._id = ctx._type + \":\" + ctx._id; ctx._type = \"doc\"; ",
 -        "lang": "painless"
 -      }
 -    }
 -  '
 -  curl -X POST "localhost:9200/_aliases" -H 'Content-Type: application/json' -d'
 -    {
 -      "actions" : [
 -        { "add":  { "index": ".kibana-6", "alias": ".kibana" } },
 -        { "remove_index": { "index": ".kibana" } }
 -      ]
 -    }
 -  '
 -fi
 -
 <% end %>
 
 exit 0
 diff --git cloud.gov/jobs/kibana/templates/config/kibana.conf.erb cloudfoundry-community/jobs/kibana/templates/config/kibana.conf.erb
 index 3f2bdc5..08e0341 100644
 --- cloud.gov/jobs/kibana/templates/config/kibana.conf.erb
 +++ cloudfoundry-community/jobs/kibana/templates/config/kibana.conf.erb
 @@ -89,17 +89,7 @@ elasticsearch.shardTimeout: <%= p('kibana.shard_timeout') %>
 
 # Configure development console
 console.enabled: <%= p("kibana.console_enabled") %>
 -xpack.searchprofiler.enabled: <%= p("kibana.searchprofiler_enabled") %>
 -xpack.grokdebugger.enabled: <%= p("kibana.grokdebugger_enabled") %>
 
 -# configure apm
 -xpack.apm.ui.enabled: <%= p("kibana.apm_enabled") %>
 -
 -# disable x-pack
 -xpack.monitoring.enabled: false
 -xpack.graph.enabled: false
 -xpack.ml.enabled: false
 -xpack.security.enabled: false
 -xpack.watcher.enabled: false
 -
 -<% if_p('kibana.config_options') do | v | %><%= v %><% end %>
 +<% if_p('kibana.config_options') do p("kibana.config_options", {}).each do | k, v | %>
 +<%= k %>: <%= v %><% end %>
 +<% end %>
 \ No newline at end of file
 diff --git cloud.gov/jobs/syslog_forwarder/monit cloudfoundry-community/jobs/syslog_forwarder/monit
 new file mode 100644
 index 0000000..e69de29
 diff --git cloud.gov/jobs/syslog_forwarder/spec cloudfoundry-community/jobs/syslog_forwarder/spec
 new file mode 100644
 index 0000000..cef5516
 --- /dev/null
 +++ cloudfoundry-community/jobs/syslog_forwarder/spec
 @@ -0,0 +1,31 @@
 +---
 +name: syslog_forwarder
 +
 +templates:
 +  config/rsyslog_file_forwarder.conf: config/rsyslog_file_forwarder.conf
 +  bin/pre-start: bin/pre-start
 +
 +packages: []
 +
 +consumes:
 +- name: syslog_forwarder
 +  type: syslog_forwarder
 +  optional: true
 +
 +properties:
 +  syslog_forwarder.config:
 +    description: |
 +      List of service name and logfile definitions.
 +      Service is the syslog_program in the final log message.
 +      File is the path to the log file rsyslogd should stream to the remote syslog server
 +    default: []
 +    example: |
 +      - { service: elasticsearch, file: /var/vcap/sys/log/elasticsearch.stdout.log }
 +      - { service: elasticsearch, file: /var/vcap/sys/log/elasticsearch.stderr.log }
 +      - { service: kibana, file: /var/vcap/sys/log/kibana/kibana.stdout.log }
 +  syslog_forwarder.host:
 +    description: Hostname of the remote syslog server
 +    default: ""
 +  syslog_forwarder.port:
 +    description: Port of the remote syslog server
 +    default: 5514
 diff --git cloud.gov/jobs/syslog_forwarder/templates/bin/pre-start cloudfoundry-community/jobs/syslog_forwarder/templates/bin/pre-start
 new file mode 100644
 index 0000000..861e53a
 --- /dev/null
 +++ cloudfoundry-community/jobs/syslog_forwarder/templates/bin/pre-start
 @@ -0,0 +1,11 @@
 +#!/bin/bash -e
 +
 +mkdir -p /var/vcap/sys/run/rsyslogd
 +chown syslog /var/vcap/sys/run/rsyslogd/
 +
 +<% p("syslog_forwarder.config").each do |config| %>
 +mkdir -p $(dirname "<%= config["file"] %>")
 +<% end %>
 +
 +cp /var/vcap/jobs/syslog_forwarder/config/rsyslog_file_forwarder.conf /etc/rsyslog.d/
 +service rsyslog restart
 diff --git cloud.gov/jobs/syslog_forwarder/templates/config/rsyslog_file_forwarder.conf cloudfoundry-community/jobs/syslog_forwarder/templates/config/rsyslog_file_forwarder.conf
 new file mode 100644
 index 0000000..157889c
 --- /dev/null
 +++ cloudfoundry-community/jobs/syslog_forwarder/templates/config/rsyslog_file_forwarder.conf
 @@ -0,0 +1,54 @@
 +<% if p("syslog_forwarder.config").any? %>
 +
 +<%
 +  networks = spec.networks.marshal_dump.values
 +  network = networks.find do |network_spec|
 +    network_spec.default
 +  end
 +
 +  network ||= networks.first
 +  job_ip = network.ip
 +%>
 +
 +module(load="imfile")
 +$WorkDirectory /var/vcap/sys/run/rsyslogd
 +
 +<% p("syslog_forwarder.config").each do |config| %>
 +input(type="imfile"
 +  File="<%= config["file"] %>"
 +  Tag="<%= config["service"] %>"
 +  Ruleset="ToMonitor")
 +
 +<% end %>
 +
 +template(name="fileForwarding" type="list") {
 +  constant(value="<")
 +  property(name="pri")
 +  constant(value=">")
 +  constant(value="1 ")
 +  property(name="timestamp" dateFormat="rfc3339")
 +  constant(value=" <%= job_ip %> ")
 +  property(name="programname")
 +  constant(value=" - - [- job=<%= name %> index=<%= index %>] ")
 +  property(name="msg")
 +}
 +
 +<%
 +  syslog_forwarder_host = nil
 +  if_link("syslog_forwarder") { |syslog_forwarder_link| syslog_forwarder_host = syslog_forwarder_link.instances.first.address }
 +  unless syslog_forwarder_host
 +    syslog_forwarder_host = p("syslog_forwarder.host")
 +  end
 +
 +  syslog_forwarder_port = nil
 +  if_link("syslog_forwarder") { |syslog_forwarder_link| syslog_forwarder_port = syslog_forwarder_link.p("logstash_ingestor.syslog.port") }
 +  unless syslog_forwarder_port
 +    syslog_forwarder_port = p("syslog_forwarder.port")
 +  end
 +%>
 +
 +ruleset(name="ToMonitor") {
 +  action(type="omfwd" Target="<%= syslog_forwarder_host %>" Port="<%= syslog_forwarder_port %>" Protocol="tcp" Template="fileForwarding")
 +}
 +
 +<% end %>
 diff --git cloud.gov/packages/cerebro/packaging cloudfoundry-community/packages/cerebro/packaging
 index cf7dc4f..acbe5f9 100644
 --- cloud.gov/packages/cerebro/packaging
 +++ cloudfoundry-community/packages/cerebro/packaging
 @@ -1,3 +1,3 @@
 set -e
 
 -tar xzf cerebro/cerebro-0.6.6.tgz -C ${BOSH_INSTALL_TARGET} --strip-components 1
 +tar xzf cerebro/cerebro-0.8.1.tgz -C ${BOSH_INSTALL_TARGET} --strip-components 1
 diff --git cloud.gov/packages/cerebro/spec cloudfoundry-community/packages/cerebro/spec
 index 90840ac..265faad 100644
 --- cloud.gov/packages/cerebro/spec
 +++ cloudfoundry-community/packages/cerebro/spec
 @@ -2,4 +2,4 @@
 name: cerebro
 
 files:
 -  - cerebro/cerebro-0.6.6.tgz
 +  - cerebro/cerebro-0.8.1.tgz
 diff --git cloud.gov/packages/curator/packaging cloudfoundry-community/packages/curator/packaging
 index 6234876..e56a037 100644
 --- cloud.gov/packages/curator/packaging
 +++ cloudfoundry-community/packages/curator/packaging
 @@ -1,8 +1,9 @@
 +#!/usr/bin/env bash
 set -e
 
 -export PATH=/var/vcap/packages/python3/bin:$PATH LD_LIBRARY_PATH=/var/vcap/packages/python3/lib:$LD_LIBRARY_PATH C_INCLUDE_PATH=/var/vcap/packages/python3/include:$C_INCLUDE_PATH
 +export PATH="/var/vcap/packages/python3/bin:${PATH}" LD_LIBRARY_PATH="/var/vcap/packages/python3/lib:${LD_LIBRARY_PATH}" C_INCLUDE_PATH="/var/vcap/packages/python3/include:${C_INCLUDE_PATH}"
 
 # --no-index prevents contacting pypi to download packages
 # --find-links tells pip where to look for the dependancies
 # --prefix installation prefix where lib, bin and other top-level folders are placed
 -pip3 install --no-index --find-links ./curator/vendor/ --prefix=${BOSH_INSTALL_TARGET} curator/elasticsearch-curator-5.6.0.tar.gz
 +pip3 install --no-index --find-links ./curator/vendor/ "--prefix=${BOSH_INSTALL_TARGET}" curator/elasticsearch-curator-v5.4.0.tar.gz
 diff --git cloud.gov/packages/curator/spec cloudfoundry-community/packages/curator/spec
 index c677701..6726183 100644
 --- cloud.gov/packages/curator/spec
 +++ cloudfoundry-community/packages/curator/spec
 @@ -5,21 +5,10 @@ dependencies:
   - python3
 
 files:
 -  - curator/elasticsearch-curator-5.6.0.tar.gz
 -  - curator/vendor/boto3-1.9.82.tar.gz
 -  - curator/vendor/botocore-1.12.82.tar.gz
 -  - curator/vendor/certifi-2018.11.29.tar.gz
 -  - curator/vendor/chardet-3.0.4.tar.gz
 -  - curator/vendor/click-6.7.tar.gz
 -  - curator/vendor/docutils-0.14.tar.gz
 -  - curator/vendor/elasticsearch-6.3.1.tar.gz
 -  - curator/vendor/idna-2.8.tar.gz
 -  - curator/vendor/jmespath-0.9.3.tar.gz
 -  - curator/vendor/python-dateutil-2.7.5.tar.gz
 -  - curator/vendor/PyYAML-3.13.tar.gz
 -  - curator/vendor/requests-2.21.0.tar.gz
 -  - curator/vendor/requests-aws4auth-0.9.tar.gz
 -  - curator/vendor/s3transfer-0.1.13.tar.gz
 -  - curator/vendor/six-1.12.0.tar.gz
 -  - curator/vendor/urllib3-1.24.1.tar.gz
 -  - curator/vendor/voluptuous-0.11.5.tar.gz
 +  - curator/elasticsearch-curator-v5.4.0.tar.gz
 +  - curator/vendor/Click-7.0-py2.py3-none-any.whl
 +  - curator/vendor/PyYAML-5.1.tar.gz
 +  - curator/vendor/certifi-2019.3.9-py2.py3-none-any.whl
 +  - curator/vendor/elasticsearch-6.3.1-py2.py3-none-any.whl
 +  - curator/vendor/urllib3-1.24.1-py2.py3-none-any.whl
 +  - curator/vendor/voluptuous-0.11.5-py2.py3-none-any.whl
 diff --git cloud.gov/packages/elasticsearch/packaging cloudfoundry-community/packages/elasticsearch/packaging
 index c881855..afc7ac0 100644
 --- cloud.gov/packages/elasticsearch/packaging
 +++ cloudfoundry-community/packages/elasticsearch/packaging
 @@ -1,3 +1,3 @@
 set -e
 
 -tar xzf elasticsearch/elasticsearch-6.3.2.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
 +tar xzf elasticsearch/elasticsearch-6.7.2.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
 diff --git cloud.gov/packages/elasticsearch/spec cloudfoundry-community/packages/elasticsearch/spec
 index 0d9b9f4..58715cb 100644
 --- cloud.gov/packages/elasticsearch/spec
 +++ cloudfoundry-community/packages/elasticsearch/spec
 @@ -2,4 +2,4 @@
 name: elasticsearch
 
 files:
 -  - elasticsearch/elasticsearch-6.3.2.tar.gz
 +  - elasticsearch/elasticsearch-6.7.2.tar.gz
 diff --git cloud.gov/packages/java8/packaging cloudfoundry-community/packages/java8/packaging
 deleted file mode 100644
 index a5e9d1a..0000000
 --- cloud.gov/packages/java8/packaging
 +++ /dev/null
 @@ -1,3 +0,0 @@
 -set -e
 -
 -tar xzf java8/openjdk-1.8.0_152.tar.gz -C $BOSH_INSTALL_TARGET
 diff --git cloud.gov/packages/java8/spec cloudfoundry-community/packages/java8/spec
 deleted file mode 100644
 index cf00b60..0000000
 --- cloud.gov/packages/java8/spec
 +++ /dev/null
 @@ -1,5 +0,0 @@
 ----
 -name: java8
 -
 -files:
 -  - java8/openjdk-1.8.0_152.tar.gz
 diff --git cloud.gov/packages/kibana/packaging cloudfoundry-community/packages/kibana/packaging
 index d632275..99e66a7 100644
 --- cloud.gov/packages/kibana/packaging
 +++ cloudfoundry-community/packages/kibana/packaging
 @@ -1,3 +1,3 @@
 set -e
 
 -tar xzf kibana/kibana-6.3.2-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
 +tar xzf kibana/kibana-6.4.3-linux-x86_64.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
 diff --git cloud.gov/packages/kibana/spec cloudfoundry-community/packages/kibana/spec
 index 60fb160..b1d5263 100644
 --- cloud.gov/packages/kibana/spec
 +++ cloudfoundry-community/packages/kibana/spec
 @@ -2,4 +2,4 @@
 name: kibana
 
 files:
 -  - kibana/kibana-6.3.2-linux-x86_64.tar.gz
 +  - kibana/kibana-6.4.3-linux-x86_64.tar.gz
 diff --git cloud.gov/packages/logsearch-config/packaging cloudfoundry-community/packages/logsearch-config/packaging
 index af7059e..d9a964a 100644
 --- cloud.gov/packages/logsearch-config/packaging
 +++ cloudfoundry-community/packages/logsearch-config/packaging
 @@ -1,16 +1,18 @@
 -set -e # exit immediately if a simple command exits with a non-zero status
 -set -u # report the usage of uninitialized variables
 +#!/usr/bin/env bash
 
 - # Available variables
 -# $BOSH_COMPILE_TARGET - where this package & spec'd source files are available
 -# $BOSH_INSTALL_TARGET - where you copy/install files to be included in package
 +set -e -x
 
 -export PATH=/var/vcap/packages/ruby2.3/bin:$PATH
 +RAKE_VERSION=$(find ruby -maxdepth 1 -name 'rake-*' | sed 's/ruby\/rake-\(.*\)\.gem/\1/' | head -1)
 +
 +# shellcheck disable=1090
 +source "${BOSH_PACKAGES_DIR:-/var/vcap/packages}/ruby-2.4-r5/bosh/compile.env"
 +
 +gem install "ruby/rake-${RAKE_VERSION}.gem" --local --no-ri --no-rdoc
 
 logsearch-config/bin/build
 
 -cp logsearch-config/target/* $BOSH_INSTALL_TARGET
 -cp logsearch-config/src/logstash-filters/if_it_looks_like_json.conf $BOSH_INSTALL_TARGET
 -cp logsearch-config/src/logstash-filters/timecop.conf $BOSH_INSTALL_TARGET
 -cp logsearch-config/src/logstash-filters/deployment.conf $BOSH_INSTALL_TARGET
 -cp logsearch-config/src/logstash-filters/deployment_lookup.yml $BOSH_INSTALL_TARGET
 +cp logsearch-config/target/* "${BOSH_INSTALL_TARGET}"
 +cp logsearch-config/src/logstash-filters/if_it_looks_like_json.conf "${BOSH_INSTALL_TARGET}"
 +cp logsearch-config/src/logstash-filters/timecop.conf "${BOSH_INSTALL_TARGET}"
 +cp logsearch-config/src/logstash-filters/deployment.conf "${BOSH_INSTALL_TARGET}"
 +cp logsearch-config/src/logstash-filters/deployment_lookup.yml "${BOSH_INSTALL_TARGET}"
 diff --git cloud.gov/packages/logsearch-config/spec cloudfoundry-community/packages/logsearch-config/spec
 index b14042d..579cf38 100644
 --- cloud.gov/packages/logsearch-config/spec
 +++ cloudfoundry-community/packages/logsearch-config/spec
 @@ -2,7 +2,8 @@
 name: logsearch-config
 
 dependencies:
 -  - ruby2.3
 +  - ruby-2.4-r5
 
 files:
 -- logsearch-config/**/*
 +  - logsearch-config/**/*
 +  - ruby/rake-12.3.2.gem
 diff --git cloud.gov/packages/logstash/packaging cloudfoundry-community/packages/logstash/packaging
 index 9239d60..3677e1d 100644
 --- cloud.gov/packages/logstash/packaging
 +++ cloudfoundry-community/packages/logstash/packaging
 @@ -1,11 +1,16 @@
 -set -e
 +#!/usr/bin/env bash
 
 -export JAVA_HOME=/var/vcap/packages/java8
 +set -e -u
 
 -tar xzf logstash/logstash-6.3.2.tar.gz -C $BOSH_INSTALL_TARGET --strip-components 1
 +# shellcheck disable=1091
 +source /var/vcap/packages/openjdk-8/bosh/compile.env
 +
 +tar xzf logstash/logstash-6.4.3.tar.gz -C "${BOSH_INSTALL_TARGET}" --strip-components 1
 +
 +export PATH="${BOSH_INSTALL_TARGET}/bin:${PATH}"
 
 # Installs missing plugins
 -$BOSH_INSTALL_TARGET/bin/logstash-plugin install file://$PWD/logstash/logstash-filter-alter-3.0.2.zip
 -$BOSH_INSTALL_TARGET/bin/logstash-plugin install file://$PWD/logstash/logstash-input-relp-3.0.2.zip
 -$BOSH_INSTALL_TARGET/bin/logstash-plugin install file://$PWD/logstash/logstash-filter-translate-3.0.3.zip
 -$BOSH_INSTALL_TARGET/bin/logstash-plugin install file://$PWD/logstash/logstash-input-syslog-3.2.2.zip
 +logstash-plugin install "file://${PWD}/logstash/logstash-filter-alter-3.0.2.zip"
 +logstash-plugin install "file://${PWD}/logstash/logstash-input-relp-3.0.2.zip"
 +logstash-plugin install "file://${PWD}/logstash/logstash-filter-translate-3.0.3.zip"
 +logstash-plugin install "file://${PWD}/logstash/logstash-input-syslog-3.2.2.zip"
 diff --git cloud.gov/packages/logstash/spec cloudfoundry-community/packages/logstash/spec
 index 87685be..c9335c4 100644
 --- cloud.gov/packages/logstash/spec
 +++ cloudfoundry-community/packages/logstash/spec
 @@ -2,10 +2,10 @@
 name: logstash
 
 dependencies:
 -  - java8
 +  - openjdk-8
 
 files:
 -  - logstash/logstash-6.3.2.tar.gz
 +  - logstash/logstash-6.4.3.tar.gz
   - logstash/logstash-filter-alter-3.0.2.zip
   - logstash/logstash-filter-translate-3.0.3.zip
   - logstash/logstash-input-relp-3.0.2.zip
 diff --git cloud.gov/packages/openjdk-8/spec.lock cloudfoundry-community/packages/openjdk-8/spec.lock
 new file mode 100644
 index 0000000..4c578e3
 --- /dev/null
 +++ cloudfoundry-community/packages/openjdk-8/spec.lock
 @@ -0,0 +1,2 @@
 +name: openjdk-8
 +fingerprint: 2d3d1ec9f37bcd93bfefc839ee159be28519b20a
 diff --git cloud.gov/packages/python3/packaging cloudfoundry-community/packages/python3/packaging
 index a0e4c96..86ebbf0 100644
 --- cloud.gov/packages/python3/packaging
 +++ cloudfoundry-community/packages/python3/packaging
 @@ -1,15 +1,26 @@
 -set -e
 +#!/usr/bin/env bash
 +set -euo pipefail
 
 -CPUS=`grep -c ^processor /proc/cpuinfo`
 +CPUS=$(grep -c ^processor /proc/cpuinfo)
 +PYTHON_VERSION=3.6.2
 
 -tar xzf python/Python-3.6.2.tgz
 +tar xzf "python/Python-${PYTHON_VERSION}.tgz"
 
 -pushd Python-3.6.2
 +pushd "Python-${PYTHON_VERSION}"
   ./configure \
 -    --prefix=${BOSH_INSTALL_TARGET} \
 +    --prefix="${BOSH_INSTALL_TARGET}" \
     --with-ensurepip \
     --enable-shared
 
 -  make -j${CPUS}
 +  make -j"${CPUS}"
   make install
 popd
 +
 +export PATH="${BOSH_INSTALL_TARGET}/bin:${PATH}"
 +export LD_LIBRARY_PATH="${BOSH_INSTALL_TARGET}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 +export C_INCLUDE_PATH="${BOSH_INSTALL_TARGET}/include${C_INCLUDE_PATH:+:$C_INCLUDE_PATH}"
 +
 +# --no-index prevents contacting pypi to download packages
 +# --find-links tells pip where to look for the dependancies
 +# --prefix installation prefix where lib, bin and other top-level folders are placed
 +pip3 install --no-index --find-links ./python/vendor/ "--prefix=${BOSH_INSTALL_TARGET}" python/requests-2.21.0-py2.py3-none-any.whl
 diff --git cloud.gov/packages/python3/spec cloudfoundry-community/packages/python3/spec
 index c230847..41776a6 100644
 --- cloud.gov/packages/python3/spec
 +++ cloudfoundry-community/packages/python3/spec
 @@ -3,3 +3,9 @@ name: python3
 
 files:
   - python/Python-3.6.2.tgz
 +  - python/requests-2.21.0-py2.py3-none-any.whl
 +  - python/vendor/certifi-2019.3.9-py2.py3-none-any.whl
 +  - python/vendor/chardet-3.0.4-py2.py3-none-any.whl
 +  - python/vendor/idna-2.8-py2.py3-none-any.whl
 +  - python/vendor/urllib3-1.24.2-py2.py3-none-any.whl
 +
 diff --git cloud.gov/packages/ruby-2.4-r5/spec.lock cloudfoundry-community/packages/ruby-2.4-r5/spec.lock
 new file mode 100644
 index 0000000..32a080c
 --- /dev/null
 +++ cloudfoundry-community/packages/ruby-2.4-r5/spec.lock
 @@ -0,0 +1,2 @@
 +name: ruby-2.4-r5
 +fingerprint: 726cbb2214e138b576700db6a30698edb2b994e2
 diff --git cloud.gov/packages/ruby2.3/README.md cloudfoundry-community/packages/ruby2.3/README.md
 deleted file mode 100644
 index 5af8e86..0000000
 --- cloud.gov/packages/ruby2.3/README.md
 +++ /dev/null
 @@ -1,12 +0,0 @@
 -ruby-package
 -============
 -This repo is used for ruby packaging in BOSH deployments.
 -
 -The files can be downloaded from the following locations:
 -
 -| Filename | Download URL |
 -| -------- | ------------ |
 -| ruby-2.3.1.tar.gz | [ruby-lang.org](http://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz) |
 -| rubygems-2.6.4.tgz | [rubygems.org](http://production.cf.rubygems.org/rubygems/rubygems-2.6.4.tgz) |
 -| bundler-1.11.2.gem | [rubygems.org](https://rubygems.org/downloads/bundler-1.11.2.gem) |
 -| rake-11.2.2.gem | [rubygems.org](https://rubygems.org/downloads/rake-11.2.2.gem) |
 diff --git cloud.gov/packages/ruby2.3/packaging cloudfoundry-community/packages/ruby2.3/packaging
 deleted file mode 100644
 index f0c0c40..0000000
 --- cloud.gov/packages/ruby2.3/packaging
 +++ /dev/null
 @@ -1,34 +0,0 @@
 -# abort script on any command that exits with a non zero value
 -set -e
 -
 -# We grab the latest versions that are in the directory
 -RUBY_VERSION=`ls -r ruby2.3/ruby-* | sed 's/ruby2.3\/ruby-\(.*\)\.tar\.gz/\1/' | head -1`
 -RUBYGEMS_VERSION=`ls -r ruby2.3/rubygems-* | sed 's/ruby2.3\/rubygems-\(.*\)\.tgz/\1/' | head -1`
 -BUNDLER_VERSION=`ls -r ruby2.3/bundler-* | sed 's/ruby2.3\/bundler-\(.*\)\.gem/\1/' | head -1`
 -RAKE_VERSION=`ls -r ruby2.3/rake-* | sed 's/ruby2.3\/rake-\(.*\)\.gem/\1/' | head -1`
 -
 -tar xzf ruby2.3/ruby-${RUBY_VERSION}.tar.gz
 -(
 -  set -e
 -  cd ruby-${RUBY_VERSION}
 -  LDFLAGS="-Wl,-rpath -Wl,${BOSH_INSTALL_TARGET}" ./configure --prefix=${BOSH_INSTALL_TARGET} --disable-install-doc --with-opt-dir=${BOSH_INSTALL_TARGET}
 -  make
 -  make install
 -)
 -
 -tar zxvf ruby2.3/rubygems-${RUBYGEMS_VERSION}.tgz
 -(
 -  set -e
 -  cd rubygems-${RUBYGEMS_VERSION}
 -
 -  ${BOSH_INSTALL_TARGET}/bin/ruby setup.rb
 -
 -  if [[ $? != 0 ]] ; then
 -    echo "Cannot install rubygems"
 -    exit 1
 -  fi
 -)
 -
 -${BOSH_INSTALL_TARGET}/bin/gem install ruby2.3/bundler-${BUNDLER_VERSION}.gem --local --no-ri --no-rdoc
 -
 -${BOSH_INSTALL_TARGET}/bin/gem install ruby2.3/rake-${RAKE_VERSION}.gem --local --no-ri --no-rdoc
 diff --git cloud.gov/packages/ruby2.3/spec cloudfoundry-community/packages/ruby2.3/spec
 deleted file mode 100644
 index 77e7966..0000000
 --- cloud.gov/packages/ruby2.3/spec
 +++ /dev/null
 @@ -1,8 +0,0 @@
 ----
 -name: ruby2.3
 -
 -files:
 -  - ruby2.3/ruby-2.3.1.tar.gz
 -  - ruby2.3/rubygems-2.6.4.tgz
 -  - ruby2.3/bundler-1.11.2.gem
 -  - ruby2.3/rake-11.2.2.gem
 diff --git cloud.gov/releases/logsearch/index.yml cloudfoundry-community/releases/logsearch/index.yml
 index 273fa83..6eaeb3d 100644
 --- cloud.gov/releases/logsearch/index.yml
 +++ cloudfoundry-community/releases/logsearch/index.yml
 @@ -21,12 +21,16 @@ builds:
     version: 207.0.0
   1ac18f79-24de-42a7-9ae4-8238919662c6:
     version: 206.0.1
 +  1b1d0605-d7d3-491e-7960-eb6734256105:
 +    version: 210.1.0
   1cb06d94-ab78-4cec-a435-550cb38ff162:
     version: 202.0.0
   22649efd-ab46-489a-bfec-e3d6e120b5a4:
     version: 201.0.15
   29b792e3-527d-4451-9b6b-ab6e13a32928:
     version: "21"
 +  304b80ca-9f9b-4f7e-4ca1-3f17320a7cd5:
 +    version: 209.0.2
   35324d63f8e5c347b30b14f87411effdb5766986:
     version: "8"
   37cefc28-b0ca-4841-85db-3d97e9c386d8:
 @@ -47,6 +51,8 @@ builds:
     version: "18"
   5c4d234497257f34f61efc52744d2634557cf445:
     version: "13"
 +  5cce3324-4b50-4893-4216-69ab4246b2bc:
 +    version: 209.1.0
   5f6f13331908c283c08d36a6d947c54e189e6862:
     version: "14"
   62d9c6568ab81b2d1eac6a3d5f001566fd7308a7:
 @@ -81,12 +87,18 @@ builds:
     version: 201.0.9
   cd528f68-f8f8-4d42-ae36-82d024bc0cf0:
     version: "22"
 +  cf07a3cb-f985-4d3c-545f-6b588fdd5a44:
 +    version: 209.0.1
   e135b5d3a8a4e09bcbd7f0e085c81d9f2812dfd4:
     version: "2"
   eeee8387-760b-4789-95a3-f45a480fc24e:
     version: 201.0.2
   f5e27c62-648b-4854-9b28-1223e47b59f4:
     version: 206.0.0
 +  f78bbc7c-6212-4ae4-788c-8b0e91644037:
 +    version: 210.0.0
   fadd88a3-2fe7-4095-b68e-fc3da3ae42a5:
     version: 208.0.0
 +  feaec8ce-70d7-42d1-728a-a108b9f9843d:
 +    version: 210.2.0
 format-version: "2"
 diff --git cloud.gov/releases/logsearch/logsearch-209.0.1.yml cloudfoundry-community/releases/logsearch/logsearch-209.0.1.yml
 new file mode 100644
 index 0000000..80e334b
 --- /dev/null
 +++ cloudfoundry-community/releases/logsearch/logsearch-209.0.1.yml
 @@ -0,0 +1,112 @@
 +name: logsearch
 +version: 209.0.1
 +commit_hash: b7bb8e7
 +uncommitted_changes: false
 +jobs:
 +- name: archiver_syslog
 +  version: 024340d8d44f7c2c67a5037ceaec88ab99d7f6848a138419774d243e01480f90
 +  fingerprint: 024340d8d44f7c2c67a5037ceaec88ab99d7f6848a138419774d243e01480f90
 +  sha1: sha256:08f57c00a283e586c642668163206aaf7d4f5741e0f8b49c4e1aa4a4f28ad820
 +- name: cerebro
 +  version: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +  fingerprint: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +  sha1: sha256:f15419f3612f9d953a76c92ed5444481a0f04434883b6ee418c3bfe7bffded87
 +- name: curator
 +  version: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  fingerprint: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  sha1: sha256:42217dcd0401babe75ea7f19c5b9ac8b6f2cdb73bad7209f65a4798c940488cd
 +- name: elasticsearch
 +  version: aa6a07abae57c35ae8ae6ac45ec363150cf6fa46a4d609eae2d6c953e67b4250
 +  fingerprint: aa6a07abae57c35ae8ae6ac45ec363150cf6fa46a4d609eae2d6c953e67b4250
 +  sha1: sha256:8ce91834280fc3e61e0d837f04da7becfb93bb209a5c35f05755144c1dded4a4
 +- name: elasticsearch_config
 +  version: 20b64d95e1968966271dad9b0c8d554d864ab18c1ce94fd47e5e91519eb81d3b
 +  fingerprint: 20b64d95e1968966271dad9b0c8d554d864ab18c1ce94fd47e5e91519eb81d3b
 +  sha1: sha256:3119b80760c4dbaa782ff1cba476292466db6066a51858d1acc391a08a710d83
 +- name: haproxy
 +  version: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  fingerprint: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  sha1: sha256:e2ebdd5e0d32bed501062489eb231f08fee0ab3d02793ac1d8841ea47c073305
 +- name: ingestor_syslog
 +  version: 22302014f8ffb7544945457431c32b6bc605a69cefd0e6682796f9ecb2785f36
 +  fingerprint: 22302014f8ffb7544945457431c32b6bc605a69cefd0e6682796f9ecb2785f36
 +  sha1: sha256:682ab44206485e59924047308cd951a0f5374832aed750b258d95acf345b0209
 +- name: kibana
 +  version: 5250c0382c4df573a5c920d6f762d3a8f0bbab38d6f25c0f534e29bb5f9026eb
 +  fingerprint: 5250c0382c4df573a5c920d6f762d3a8f0bbab38d6f25c0f534e29bb5f9026eb
 +  sha1: sha256:47d10fe7ec28a8074ecc194376c245b2232f379bf0c9fa6c279f495d84f92e42
 +- name: nats_to_syslog
 +  version: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  fingerprint: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  sha1: sha256:2c6c6c3772b3128ff6686bb1be1c9b923cce8a37db412afc1fd02c7904ca63dc
 +- name: smoke_tests
 +  version: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  fingerprint: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  sha1: sha256:50875f48794db321df42a4c35ac4ae190c283cf44f77112c94f75b6a89b82f0f
 +- name: syslog_forwarder
 +  version: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  fingerprint: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  sha1: sha256:698a75d760d571038cd0d111e57eee9d6ab662f8ef7ef1d5a32bc2544f7f0c74
 +packages:
 +- name: cerebro
 +  version: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +  fingerprint: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +  sha1: sha256:d6bee2f4affe504ffdad47b3162b362ff30c0cb5b6f466a4838241297cb85ad1
 +  dependencies: []
 +- name: curator
 +  version: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +  fingerprint: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +  sha1: sha256:3e527a7f273585f650f631b3377e4c2b7cd170fabb2e8c3f310438305e8af70c
 +  dependencies:
 +  - python3
 +- name: elasticsearch
 +  version: 056589862572dda711df4f887c8dd0ce03ee8baf03918fe549f874a40a748e91
 +  fingerprint: 056589862572dda711df4f887c8dd0ce03ee8baf03918fe549f874a40a748e91
 +  sha1: sha256:42b2348f0c5a812127a4109b4177cc5bdd559d96c4b0b845165656123c713225
 +  dependencies: []
 +- name: haproxy
 +  version: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  fingerprint: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  sha1: sha256:b0d344ae781133b10b392fa0eabd11e6c6b1603b7bf3cdbddc0a336a9cf32e30
 +  dependencies: []
 +- name: java8
 +  version: e874992b9a29c7b09b2c4f98b60646cdeee6dc7020a84c55438eb18f3bab15d2
 +  fingerprint: e874992b9a29c7b09b2c4f98b60646cdeee6dc7020a84c55438eb18f3bab15d2
 +  sha1: sha256:853cb84e8423ff216ed74a886b9c556799af0a9986e877b06463631c617c496f
 +  dependencies: []
 +- name: kibana
 +  version: 3188dfce2368f99e527bc51088e6b56c39ea41efca693e03f271a82ff6711661
 +  fingerprint: 3188dfce2368f99e527bc51088e6b56c39ea41efca693e03f271a82ff6711661
 +  sha1: sha256:b5a497238847951854352a74dc198df0461795c0d33331bd3b0a9fce00ac081e
 +  dependencies: []
 +- name: logsearch-config
 +  version: 92c9feec89da10cdeedce23076adff110f62478bade9c24c3ac6f1da30f1fc60
 +  fingerprint: 92c9feec89da10cdeedce23076adff110f62478bade9c24c3ac6f1da30f1fc60
 +  sha1: sha256:935c169c61c442997ccbb714c0c856b2e1d629f4b1f2ab824bf6096652f2a4db
 +  dependencies:
 +  - ruby2.3
 +- name: logstash
 +  version: 6c2eb590f7cbddd42b478700d4815b597b8442f14c3768304e4a8890883dccc9
 +  fingerprint: 6c2eb590f7cbddd42b478700d4815b597b8442f14c3768304e4a8890883dccc9
 +  sha1: sha256:ca4f9260aa57a66ce029d7326b09ce33d81d7f4d2611596d4e888131252f23b9
 +  dependencies:
 +  - java8
 +- name: nats_to_syslog
 +  version: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  fingerprint: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  sha1: sha256:65d55addd7aa5a479cbf1e48ccd4cc03aaf0d82477497107eecab569ddf40115
 +  dependencies: []
 +- name: python3
 +  version: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +  fingerprint: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +  sha1: sha256:f84d2ebc54841c09718448554175b2941f4559979bbbd87ba88d261d10000c2e
 +  dependencies: []
 +- name: ruby2.3
 +  version: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  fingerprint: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  sha1: sha256:2f4deb31c7642d4bded2623e47332a393cc98b7a060b732d6084de0ab52c7b09
 +  dependencies: []
 +license:
 +  version: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  fingerprint: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  sha1: sha256:dec582b855538894e263d430fe548182687082ecc17a9275a003e88fdeb3a2f6
 diff --git cloud.gov/releases/logsearch/logsearch-209.0.2.yml cloudfoundry-community/releases/logsearch/logsearch-209.0.2.yml
 new file mode 100644
 index 0000000..d33db32
 --- /dev/null
 +++ cloudfoundry-community/releases/logsearch/logsearch-209.0.2.yml
 @@ -0,0 +1,112 @@
 +name: logsearch
 +version: 209.0.2
 +commit_hash: b2a9865
 +uncommitted_changes: false
 +jobs:
 +- name: archiver_syslog
 +  version: 024340d8d44f7c2c67a5037ceaec88ab99d7f6848a138419774d243e01480f90
 +  fingerprint: 024340d8d44f7c2c67a5037ceaec88ab99d7f6848a138419774d243e01480f90
 +  sha1: sha256:08f57c00a283e586c642668163206aaf7d4f5741e0f8b49c4e1aa4a4f28ad820
 +- name: cerebro
 +  version: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +  fingerprint: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +  sha1: sha256:f15419f3612f9d953a76c92ed5444481a0f04434883b6ee418c3bfe7bffded87
 +- name: curator
 +  version: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  fingerprint: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  sha1: sha256:42217dcd0401babe75ea7f19c5b9ac8b6f2cdb73bad7209f65a4798c940488cd
 +- name: elasticsearch
 +  version: 05ee8554d6faf12abc09bc52249d927d7f08f15c902c03fa406394608d62c5fc
 +  fingerprint: 05ee8554d6faf12abc09bc52249d927d7f08f15c902c03fa406394608d62c5fc
 +  sha1: sha256:920f4f868a4ced332567faea78ce9503e4a8cb9aa6c1b544fb28fab228b0a97b
 +- name: elasticsearch_config
 +  version: 20b64d95e1968966271dad9b0c8d554d864ab18c1ce94fd47e5e91519eb81d3b
 +  fingerprint: 20b64d95e1968966271dad9b0c8d554d864ab18c1ce94fd47e5e91519eb81d3b
 +  sha1: sha256:3119b80760c4dbaa782ff1cba476292466db6066a51858d1acc391a08a710d83
 +- name: haproxy
 +  version: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  fingerprint: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  sha1: sha256:e2ebdd5e0d32bed501062489eb231f08fee0ab3d02793ac1d8841ea47c073305
 +- name: ingestor_syslog
 +  version: 22302014f8ffb7544945457431c32b6bc605a69cefd0e6682796f9ecb2785f36
 +  fingerprint: 22302014f8ffb7544945457431c32b6bc605a69cefd0e6682796f9ecb2785f36
 +  sha1: sha256:682ab44206485e59924047308cd951a0f5374832aed750b258d95acf345b0209
 +- name: kibana
 +  version: c57f27985bed8a7dfcda3a7abf173bdb263e5c82ddcdc99c34721f8970358287
 +  fingerprint: c57f27985bed8a7dfcda3a7abf173bdb263e5c82ddcdc99c34721f8970358287
 +  sha1: sha256:a40f8f7ff6c3c9d153ed008f0deaf152aa84e1ccfaedb1c48891af967e867573
 +- name: nats_to_syslog
 +  version: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  fingerprint: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  sha1: sha256:2c6c6c3772b3128ff6686bb1be1c9b923cce8a37db412afc1fd02c7904ca63dc
 +- name: smoke_tests
 +  version: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  fingerprint: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  sha1: sha256:50875f48794db321df42a4c35ac4ae190c283cf44f77112c94f75b6a89b82f0f
 +- name: syslog_forwarder
 +  version: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  fingerprint: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  sha1: sha256:698a75d760d571038cd0d111e57eee9d6ab662f8ef7ef1d5a32bc2544f7f0c74
 +packages:
 +- name: cerebro
 +  version: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +  fingerprint: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +  sha1: sha256:d6bee2f4affe504ffdad47b3162b362ff30c0cb5b6f466a4838241297cb85ad1
 +  dependencies: []
 +- name: curator
 +  version: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +  fingerprint: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +  sha1: sha256:3e527a7f273585f650f631b3377e4c2b7cd170fabb2e8c3f310438305e8af70c
 +  dependencies:
 +  - python3
 +- name: elasticsearch
 +  version: 866283a5066a134d33bbc137250de7a104138bcbb88dddbe6042cd285b515402
 +  fingerprint: 866283a5066a134d33bbc137250de7a104138bcbb88dddbe6042cd285b515402
 +  sha1: sha256:b1e2c9f12d2f54c906bf6503a917b0e2630d327807d1cb6e483cc3211f209a8b
 +  dependencies: []
 +- name: haproxy
 +  version: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  fingerprint: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  sha1: sha256:b0d344ae781133b10b392fa0eabd11e6c6b1603b7bf3cdbddc0a336a9cf32e30
 +  dependencies: []
 +- name: java8
 +  version: e874992b9a29c7b09b2c4f98b60646cdeee6dc7020a84c55438eb18f3bab15d2
 +  fingerprint: e874992b9a29c7b09b2c4f98b60646cdeee6dc7020a84c55438eb18f3bab15d2
 +  sha1: sha256:853cb84e8423ff216ed74a886b9c556799af0a9986e877b06463631c617c496f
 +  dependencies: []
 +- name: kibana
 +  version: 51879ff6829ee757ea1913d9d7f1ede7254636cb6b08b35fe43a8e6f6d99f982
 +  fingerprint: 51879ff6829ee757ea1913d9d7f1ede7254636cb6b08b35fe43a8e6f6d99f982
 +  sha1: sha256:87ca5ba758cdf31680564091d43b7d9e3e5dc8bca782b6b01acaffaac8bb6798
 +  dependencies: []
 +- name: logsearch-config
 +  version: 92c9feec89da10cdeedce23076adff110f62478bade9c24c3ac6f1da30f1fc60
 +  fingerprint: 92c9feec89da10cdeedce23076adff110f62478bade9c24c3ac6f1da30f1fc60
 +  sha1: sha256:935c169c61c442997ccbb714c0c856b2e1d629f4b1f2ab824bf6096652f2a4db
 +  dependencies:
 +  - ruby2.3
 +- name: logstash
 +  version: 423926d48b7d1e6b99e10b4a1bb921af98b2827d5d769e43f226712b62247435
 +  fingerprint: 423926d48b7d1e6b99e10b4a1bb921af98b2827d5d769e43f226712b62247435
 +  sha1: sha256:4b7332bfb949a2677477e39cd4fff0fbabbf2e0f0cae2b8770c5c087dc122e21
 +  dependencies:
 +  - java8
 +- name: nats_to_syslog
 +  version: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  fingerprint: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  sha1: sha256:65d55addd7aa5a479cbf1e48ccd4cc03aaf0d82477497107eecab569ddf40115
 +  dependencies: []
 +- name: python3
 +  version: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +  fingerprint: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +  sha1: sha256:f84d2ebc54841c09718448554175b2941f4559979bbbd87ba88d261d10000c2e
 +  dependencies: []
 +- name: ruby2.3
 +  version: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  fingerprint: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  sha1: sha256:2f4deb31c7642d4bded2623e47332a393cc98b7a060b732d6084de0ab52c7b09
 +  dependencies: []
 +license:
 +  version: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  fingerprint: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  sha1: sha256:dec582b855538894e263d430fe548182687082ecc17a9275a003e88fdeb3a2f6
 diff --git cloud.gov/releases/logsearch/logsearch-209.1.0.yml cloudfoundry-community/releases/logsearch/logsearch-209.1.0.yml
 new file mode 100644
 index 0000000..94881c6
 --- /dev/null
 +++ cloudfoundry-community/releases/logsearch/logsearch-209.1.0.yml
 @@ -0,0 +1,112 @@
 +name: logsearch
 +version: 209.1.0
 +commit_hash: a3568c6
 +uncommitted_changes: true
 +jobs:
 +- name: archiver_syslog
 +  version: 7be4bc5de13d22f2a64825dddf7616f444a530c2
 +  fingerprint: 7be4bc5de13d22f2a64825dddf7616f444a530c2
 +  sha1: 52a6512c33effb706aae43b0c5edd00c5642078c
 +- name: cerebro
 +  version: d0a842a752ddc5691064fdee755186bc8b97a224
 +  fingerprint: d0a842a752ddc5691064fdee755186bc8b97a224
 +  sha1: 972f11794cf5330a6f099f7efc5aa745df12eb9b
 +- name: curator
 +  version: ecc6aada82ec9912d439b85c75d5d7c326301564
 +  fingerprint: ecc6aada82ec9912d439b85c75d5d7c326301564
 +  sha1: 67c7261b56881283f4c8e27f3da9c00da3153a16
 +- name: elasticsearch
 +  version: 0311f8180a6fbdf6545beb999f33bdb8a37277c8
 +  fingerprint: 0311f8180a6fbdf6545beb999f33bdb8a37277c8
 +  sha1: f11d2c6f0c8ce9d67062dae0ae2fd67a6a5e4e6c
 +- name: elasticsearch_config
 +  version: b1cdc7940894ce9cca52ec06bacefdaab3e99239
 +  fingerprint: b1cdc7940894ce9cca52ec06bacefdaab3e99239
 +  sha1: b37b65868250c18e2f6fa8b8ee88bae57a603df9
 +- name: haproxy
 +  version: 6bba5cbc033c9ad28fc7803fd64af6cc27c8faea
 +  fingerprint: 6bba5cbc033c9ad28fc7803fd64af6cc27c8faea
 +  sha1: 79e1178269f01f799227b1c529fbc457b2a4253c
 +- name: ingestor_syslog
 +  version: 9ddb0a6c179e9a654c23a44008ffe7d43c14eb0d
 +  fingerprint: 9ddb0a6c179e9a654c23a44008ffe7d43c14eb0d
 +  sha1: 96a621776cbca721c8119418570612ccb0b4e57a
 +- name: kibana
 +  version: 7a54425f9973f06e823b19ac3c0ce0eb568df3d8
 +  fingerprint: 7a54425f9973f06e823b19ac3c0ce0eb568df3d8
 +  sha1: a69c3d45eb7fd85aef469dfbeec957aef1e1014a
 +- name: nats_to_syslog
 +  version: 96fbe682552a1b79891d60cf9bc3ca4ff9ce6378
 +  fingerprint: 96fbe682552a1b79891d60cf9bc3ca4ff9ce6378
 +  sha1: d664f6b83c5c7931f21d1fc19e7e957146116793
 +- name: smoke_tests
 +  version: 1e599855bff6b972027e55fc0e660c278c0e4407
 +  fingerprint: 1e599855bff6b972027e55fc0e660c278c0e4407
 +  sha1: d89b4ea3caabb251885ebd36332b5292e3a11f01
 +- name: syslog_forwarder
 +  version: 074a9eb9b5c126a7024c950d3abcbdf320c74ee2
 +  fingerprint: 074a9eb9b5c126a7024c950d3abcbdf320c74ee2
 +  sha1: 06e8781971d10bca228f915e7337f217fff768e7
 +packages:
 +- name: cerebro
 +  version: 87db3d03e1ac9d8c6ceffb4d2c6ccc541ecd8d49
 +  fingerprint: 87db3d03e1ac9d8c6ceffb4d2c6ccc541ecd8d49
 +  sha1: 1d078be4c85edf7e0b9cc9d98e87663425c6c353
 +  dependencies: []
 +- name: curator
 +  version: 1c2e8a0584f2a4761d16e945c53587fc9263872d
 +  fingerprint: 1c2e8a0584f2a4761d16e945c53587fc9263872d
 +  sha1: 87c2572be72d0b2e22eca1adfb83c7f0ac818c26
 +  dependencies:
 +  - python3
 +- name: elasticsearch
 +  version: 5a48bac4731a10de201ec9d9609472cefbe7c4c3
 +  fingerprint: 5a48bac4731a10de201ec9d9609472cefbe7c4c3
 +  sha1: 95267f4a5aa29d17011a5792289ec5774d50481f
 +  dependencies: []
 +- name: haproxy
 +  version: 1d59aa8ae61da532ade4e9f5129428bbc101be64
 +  fingerprint: 1d59aa8ae61da532ade4e9f5129428bbc101be64
 +  sha1: abeb910545f33d77dbec00672f28d40edd9514dd
 +  dependencies: []
 +- name: java8
 +  version: 69a9b3a88520da3a9f845b5b55de0f11bcfee461
 +  fingerprint: 69a9b3a88520da3a9f845b5b55de0f11bcfee461
 +  sha1: 749d79a2e08a5953577eba084fe4987e10ab580d
 +  dependencies: []
 +- name: kibana
 +  version: 9ef74afdbaaeadafda168bc8cdd7149e6a78611b
 +  fingerprint: 9ef74afdbaaeadafda168bc8cdd7149e6a78611b
 +  sha1: 07855a16da4c3dc56cdf173ed105cb51ea0c9b55
 +  dependencies: []
 +- name: logsearch-config
 +  version: 3ffd3cd06b6723b9486825cb15b0ba6038ae2bdc
 +  fingerprint: 3ffd3cd06b6723b9486825cb15b0ba6038ae2bdc
 +  sha1: f6ab4d992d5fa727d464aa55d3bf5a428da7ea11
 +  dependencies:
 +  - ruby2.3
 +- name: logstash
 +  version: e1617fae133c689b720a0a0cbe8d717ff27df701
 +  fingerprint: e1617fae133c689b720a0a0cbe8d717ff27df701
 +  sha1: 6bcefae56cef2dfdc894355399952336e5ce707a
 +  dependencies:
 +  - java8
 +- name: nats_to_syslog
 +  version: f3267716fa78721e65fc1b804684dd6c4bd3de9d
 +  fingerprint: f3267716fa78721e65fc1b804684dd6c4bd3de9d
 +  sha1: 03f165e256f67227825ec586e33af247923252b8
 +  dependencies: []
 +- name: python3
 +  version: 6bb4b525f20f5d4223bc1cde359e33637ffaf858
 +  fingerprint: 6bb4b525f20f5d4223bc1cde359e33637ffaf858
 +  sha1: e0c3bbd531327efe51943be7fc8d115b0f585dfb
 +  dependencies: []
 +- name: ruby2.3
 +  version: 613589acad7ddafc74fd12316e3d9cf5346f612e
 +  fingerprint: 613589acad7ddafc74fd12316e3d9cf5346f612e
 +  sha1: ab5bb90fdd1afdd195ef0d72f23fb2823ecc1527
 +  dependencies: []
 +license:
 +  version: 7990cd67c49dc9a4fd1cda168bb5352eca5ca67b
 +  fingerprint: 7990cd67c49dc9a4fd1cda168bb5352eca5ca67b
 +  sha1: 3710bdde30fe4fdcf117578abf4e3cfd4924709f
 diff --git cloud.gov/releases/logsearch/logsearch-210.0.0.yml cloudfoundry-community/releases/logsearch/logsearch-210.0.0.yml
 new file mode 100644
 index 0000000..bf694ab
 --- /dev/null
 +++ cloudfoundry-community/releases/logsearch/logsearch-210.0.0.yml
 @@ -0,0 +1,112 @@
 +name: logsearch
 +version: 210.0.0
 +commit_hash: 4cdd1ac
 +uncommitted_changes: true
 +jobs:
 +- name: archiver_syslog
 +  version: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +  fingerprint: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +  sha1: sha256:74f071b3951c632fc2e07238b4ffcf163b99595a1f4db793de26a47c3d8804b8
 +- name: cerebro
 +  version: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +  fingerprint: f2e9e20bf40268a5abda55942d8b3a767c752513d5688f0a903701f7c3544243
 +  sha1: sha256:f15419f3612f9d953a76c92ed5444481a0f04434883b6ee418c3bfe7bffded87
 +- name: curator
 +  version: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  fingerprint: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  sha1: sha256:42217dcd0401babe75ea7f19c5b9ac8b6f2cdb73bad7209f65a4798c940488cd
 +- name: elasticsearch
 +  version: 22f3a077cc072d43c2817f6408dc6bd3bcd6494f64c61e8f8794c4619936035c
 +  fingerprint: 22f3a077cc072d43c2817f6408dc6bd3bcd6494f64c61e8f8794c4619936035c
 +  sha1: sha256:97ea27c92808fc4ed75cd36d67daf8b67f2fdc8c9a43521c246f44e060fc8d39
 +- name: elasticsearch_config
 +  version: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +  fingerprint: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +  sha1: sha256:ccfd7ed91fe9ba819415050c48a0770bc8fb95095bf0657def72eaa830515d48
 +- name: haproxy
 +  version: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  fingerprint: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  sha1: sha256:e2ebdd5e0d32bed501062489eb231f08fee0ab3d02793ac1d8841ea47c073305
 +- name: ingestor_syslog
 +  version: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +  fingerprint: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +  sha1: sha256:56606e563c2d43425de5977a73ac8d7db5284261819fb4d2fcb08e42bedcbdf6
 +- name: kibana
 +  version: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +  fingerprint: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +  sha1: sha256:7d3a39cecf50be2403b376919248fcfcb05a08a791611244ece17052ba98a589
 +- name: nats_to_syslog
 +  version: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  fingerprint: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  sha1: sha256:2c6c6c3772b3128ff6686bb1be1c9b923cce8a37db412afc1fd02c7904ca63dc
 +- name: smoke_tests
 +  version: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  fingerprint: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  sha1: sha256:50875f48794db321df42a4c35ac4ae190c283cf44f77112c94f75b6a89b82f0f
 +- name: syslog_forwarder
 +  version: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  fingerprint: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  sha1: sha256:698a75d760d571038cd0d111e57eee9d6ab662f8ef7ef1d5a32bc2544f7f0c74
 +packages:
 +- name: cerebro
 +  version: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +  fingerprint: 8fe0afff18b50ca40832ce5e6c6b978925f80f86edbf52e6dbb783f5d8cdf5c4
 +  sha1: sha256:d6bee2f4affe504ffdad47b3162b362ff30c0cb5b6f466a4838241297cb85ad1
 +  dependencies: []
 +- name: curator
 +  version: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +  fingerprint: 5bbf4812c7b25cf7ae1a8e83dd07aec0cdb20b36400201d69e34fc739d638e87
 +  sha1: sha256:3e527a7f273585f650f631b3377e4c2b7cd170fabb2e8c3f310438305e8af70c
 +  dependencies:
 +  - python3
 +- name: elasticsearch
 +  version: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +  fingerprint: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +  sha1: sha256:a946105a304aff03b30b3b062f95368be466f856e50aa8542c0e3044c03b4758
 +  dependencies: []
 +- name: haproxy
 +  version: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  fingerprint: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  sha1: sha256:b0d344ae781133b10b392fa0eabd11e6c6b1603b7bf3cdbddc0a336a9cf32e30
 +  dependencies: []
 +- name: java8
 +  version: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +  fingerprint: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +  sha1: sha256:5e9c769fb42822b0e33ecc21fc50a4f8584e399a45ccf33b2cc99a96372d1a30
 +  dependencies: []
 +- name: kibana
 +  version: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +  fingerprint: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +  sha1: sha256:da12681a7d036eec956e55b8f3d53129668cdbcef27854caf09f9ecedc96eed5
 +  dependencies: []
 +- name: logsearch-config
 +  version: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +  fingerprint: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +  sha1: sha256:e4f0707a47ee273cf9ef11574b7c310f5df24fbca792d7465f69404506373d16
 +  dependencies:
 +  - ruby2.3
 +- name: logstash
 +  version: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +  fingerprint: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +  sha1: sha256:d2feb130384b4b2345b75ac9bb4fd95bc38329433cdb468c4cfd043f04553714
 +  dependencies:
 +  - java8
 +- name: nats_to_syslog
 +  version: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  fingerprint: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  sha1: sha256:65d55addd7aa5a479cbf1e48ccd4cc03aaf0d82477497107eecab569ddf40115
 +  dependencies: []
 +- name: python3
 +  version: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +  fingerprint: 3350f8c01249ea3a2721446d0a01223fd683b145fffc908219f244e079fa3f21
 +  sha1: sha256:f84d2ebc54841c09718448554175b2941f4559979bbbd87ba88d261d10000c2e
 +  dependencies: []
 +- name: ruby2.3
 +  version: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  fingerprint: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  sha1: sha256:2f4deb31c7642d4bded2623e47332a393cc98b7a060b732d6084de0ab52c7b09
 +  dependencies: []
 +license:
 +  version: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  fingerprint: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  sha1: sha256:dec582b855538894e263d430fe548182687082ecc17a9275a003e88fdeb3a2f6
 diff --git cloud.gov/releases/logsearch/logsearch-210.1.0.yml cloudfoundry-community/releases/logsearch/logsearch-210.1.0.yml
 new file mode 100644
 index 0000000..c969199
 --- /dev/null
 +++ cloudfoundry-community/releases/logsearch/logsearch-210.1.0.yml
 @@ -0,0 +1,140 @@
 +name: logsearch
 +version: 210.1.0
 +commit_hash: "2124344"
 +uncommitted_changes: false
 +jobs:
 +- name: archiver_syslog
 +  version: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +  fingerprint: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +  sha1: sha256:74f071b3951c632fc2e07238b4ffcf163b99595a1f4db793de26a47c3d8804b8
 +  packages:
 +  - logstash
 +  - logsearch-config
 +  - java8
 +- name: cerebro
 +  version: 105153f93461caf5827e5a48a597004834d988057a54a15c61ed813e60f317d8
 +  fingerprint: 105153f93461caf5827e5a48a597004834d988057a54a15c61ed813e60f317d8
 +  sha1: sha256:ca3c33951df7e3aea974d168cdf0d9d9ae4dee41602c91a085d7fe415038f7dd
 +  packages:
 +  - cerebro
 +  - java8
 +- name: curator
 +  version: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  fingerprint: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  sha1: sha256:42217dcd0401babe75ea7f19c5b9ac8b6f2cdb73bad7209f65a4798c940488cd
 +  packages:
 +  - curator
 +  - python3
 +- name: elasticsearch
 +  version: 5cea3d8bc20c2cd83df83e03fa2310ba51870edd24efa193662827b6e785b035
 +  fingerprint: 5cea3d8bc20c2cd83df83e03fa2310ba51870edd24efa193662827b6e785b035
 +  sha1: sha256:de85ab178856b18ba79ec7d53c9931b30870cd51fdcd00644d41e96054ff5e09
 +  packages:
 +  - elasticsearch
 +  - java8
 +- name: elasticsearch_config
 +  version: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +  fingerprint: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +  sha1: sha256:ccfd7ed91fe9ba819415050c48a0770bc8fb95095bf0657def72eaa830515d48
 +  packages:
 +  - elasticsearch
 +  - java8
 +- name: haproxy
 +  version: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  fingerprint: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  sha1: sha256:e2ebdd5e0d32bed501062489eb231f08fee0ab3d02793ac1d8841ea47c073305
 +  packages:
 +  - haproxy
 +- name: ingestor_syslog
 +  version: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +  fingerprint: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +  sha1: sha256:56606e563c2d43425de5977a73ac8d7db5284261819fb4d2fcb08e42bedcbdf6
 +  packages:
 +  - logstash
 +  - logsearch-config
 +  - java8
 +- name: kibana
 +  version: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +  fingerprint: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +  sha1: sha256:7d3a39cecf50be2403b376919248fcfcb05a08a791611244ece17052ba98a589
 +  packages:
 +  - kibana
 +- name: nats_to_syslog
 +  version: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  fingerprint: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  sha1: sha256:2c6c6c3772b3128ff6686bb1be1c9b923cce8a37db412afc1fd02c7904ca63dc
 +  packages:
 +  - nats_to_syslog
 +- name: smoke_tests
 +  version: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  fingerprint: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  sha1: sha256:50875f48794db321df42a4c35ac4ae190c283cf44f77112c94f75b6a89b82f0f
 +  packages: []
 +- name: syslog_forwarder
 +  version: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  fingerprint: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  sha1: sha256:698a75d760d571038cd0d111e57eee9d6ab662f8ef7ef1d5a32bc2544f7f0c74
 +  packages: []
 +packages:
 +- name: cerebro
 +  version: c44f6d7c7c4ccfc5142f4cd6447a0087249028eeea00874cc03430e8d57f82ab
 +  fingerprint: c44f6d7c7c4ccfc5142f4cd6447a0087249028eeea00874cc03430e8d57f82ab
 +  sha1: sha256:cf31d9e65b2c2bf7d1916f2f96abaf3225e5758ad64b5614fbf044d573d6ca4a
 +  dependencies: []
 +- name: curator
 +  version: 86c5c2302a0c376bef9d3334508e57d89431e3ea96486d5e0763ab2fe2a9abf7
 +  fingerprint: 86c5c2302a0c376bef9d3334508e57d89431e3ea96486d5e0763ab2fe2a9abf7
 +  sha1: sha256:4e9ab0fefc2032e2f17e36e3099b94a72a092e4551951b856dc343f0125ddb89
 +  dependencies:
 +  - python3
 +- name: elasticsearch
 +  version: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +  fingerprint: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +  sha1: sha256:a946105a304aff03b30b3b062f95368be466f856e50aa8542c0e3044c03b4758
 +  dependencies: []
 +- name: haproxy
 +  version: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  fingerprint: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  sha1: sha256:b0d344ae781133b10b392fa0eabd11e6c6b1603b7bf3cdbddc0a336a9cf32e30
 +  dependencies: []
 +- name: java8
 +  version: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +  fingerprint: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +  sha1: sha256:5e9c769fb42822b0e33ecc21fc50a4f8584e399a45ccf33b2cc99a96372d1a30
 +  dependencies: []
 +- name: kibana
 +  version: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +  fingerprint: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +  sha1: sha256:da12681a7d036eec956e55b8f3d53129668cdbcef27854caf09f9ecedc96eed5
 +  dependencies: []
 +- name: logsearch-config
 +  version: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +  fingerprint: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +  sha1: sha256:e4f0707a47ee273cf9ef11574b7c310f5df24fbca792d7465f69404506373d16
 +  dependencies:
 +  - ruby2.3
 +- name: logstash
 +  version: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +  fingerprint: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +  sha1: sha256:d2feb130384b4b2345b75ac9bb4fd95bc38329433cdb468c4cfd043f04553714
 +  dependencies:
 +  - java8
 +- name: nats_to_syslog
 +  version: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  fingerprint: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  sha1: sha256:65d55addd7aa5a479cbf1e48ccd4cc03aaf0d82477497107eecab569ddf40115
 +  dependencies: []
 +- name: python3
 +  version: 65e174068552708f0e7e99d22c8cb1c4eae53053d1fd12cbdbb4d0e80523a989
 +  fingerprint: 65e174068552708f0e7e99d22c8cb1c4eae53053d1fd12cbdbb4d0e80523a989
 +  sha1: sha256:329e92a15c42f8c8cc769e9088cd1e6e5fd76c3f627805ad2357869644dd9b73
 +  dependencies: []
 +- name: ruby2.3
 +  version: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  fingerprint: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  sha1: sha256:2f4deb31c7642d4bded2623e47332a393cc98b7a060b732d6084de0ab52c7b09
 +  dependencies: []
 +license:
 +  version: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  fingerprint: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  sha1: sha256:dec582b855538894e263d430fe548182687082ecc17a9275a003e88fdeb3a2f6
 diff --git cloud.gov/releases/logsearch/logsearch-210.2.0.yml cloudfoundry-community/releases/logsearch/logsearch-210.2.0.yml
 new file mode 100644
 index 0000000..88b8a8f
 --- /dev/null
 +++ cloudfoundry-community/releases/logsearch/logsearch-210.2.0.yml
 @@ -0,0 +1,140 @@
 +name: logsearch
 +version: 210.2.0
 +commit_hash: f64baff
 +uncommitted_changes: false
 +jobs:
 +- name: archiver_syslog
 +  version: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +  fingerprint: 38a6316ef27a2790092422782dcf7478db20e9a715c38f59f94fdea3fb523a46
 +  sha1: sha256:74f071b3951c632fc2e07238b4ffcf163b99595a1f4db793de26a47c3d8804b8
 +  packages:
 +  - logstash
 +  - logsearch-config
 +  - java8
 +- name: cerebro
 +  version: 105153f93461caf5827e5a48a597004834d988057a54a15c61ed813e60f317d8
 +  fingerprint: 105153f93461caf5827e5a48a597004834d988057a54a15c61ed813e60f317d8
 +  sha1: sha256:ca3c33951df7e3aea974d168cdf0d9d9ae4dee41602c91a085d7fe415038f7dd
 +  packages:
 +  - cerebro
 +  - java8
 +- name: curator
 +  version: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  fingerprint: be749c6c7615c848252b0e3e3d6ac1a078e9217e80e0bfb2f2fdbb69d0e1577f
 +  sha1: sha256:42217dcd0401babe75ea7f19c5b9ac8b6f2cdb73bad7209f65a4798c940488cd
 +  packages:
 +  - curator
 +  - python3
 +- name: elasticsearch
 +  version: 5cea3d8bc20c2cd83df83e03fa2310ba51870edd24efa193662827b6e785b035
 +  fingerprint: 5cea3d8bc20c2cd83df83e03fa2310ba51870edd24efa193662827b6e785b035
 +  sha1: sha256:de85ab178856b18ba79ec7d53c9931b30870cd51fdcd00644d41e96054ff5e09
 +  packages:
 +  - elasticsearch
 +  - java8
 +- name: elasticsearch_config
 +  version: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +  fingerprint: c4f40ff63e10e900bd5a1956530b5f7153c2cc2c78f7b02974a3e32ba2504c23
 +  sha1: sha256:ccfd7ed91fe9ba819415050c48a0770bc8fb95095bf0657def72eaa830515d48
 +  packages:
 +  - elasticsearch
 +  - java8
 +- name: haproxy
 +  version: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  fingerprint: ff10500f3ff98a32eb8139e48506a871a50e192e286de07fc5793c344976bd88
 +  sha1: sha256:e2ebdd5e0d32bed501062489eb231f08fee0ab3d02793ac1d8841ea47c073305
 +  packages:
 +  - haproxy
 +- name: ingestor_syslog
 +  version: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +  fingerprint: 3f7c1987225f3667d636bb15182dfcd5a3dc6ea4545368d304a1a91e754c6a83
 +  sha1: sha256:56606e563c2d43425de5977a73ac8d7db5284261819fb4d2fcb08e42bedcbdf6
 +  packages:
 +  - logstash
 +  - logsearch-config
 +  - java8
 +- name: kibana
 +  version: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +  fingerprint: ced77b5fcac77fb4d8ea7f3299798348967b6d51a67d592b34dee45c99c8d45b
 +  sha1: sha256:7d3a39cecf50be2403b376919248fcfcb05a08a791611244ece17052ba98a589
 +  packages:
 +  - kibana
 +- name: nats_to_syslog
 +  version: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  fingerprint: 55a3d85064ae5d22f21f22ae92f6150350a3e9748d2349ff97e05571a8c56e72
 +  sha1: sha256:2c6c6c3772b3128ff6686bb1be1c9b923cce8a37db412afc1fd02c7904ca63dc
 +  packages:
 +  - nats_to_syslog
 +- name: smoke_tests
 +  version: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  fingerprint: 5f9427bf724f7ba97cbb8f2234f26c88c0f18bcf7112ef5afbb4c4a3f1153504
 +  sha1: sha256:50875f48794db321df42a4c35ac4ae190c283cf44f77112c94f75b6a89b82f0f
 +  packages: []
 +- name: syslog_forwarder
 +  version: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  fingerprint: d73e5f26aecc21031c77460ae184c31b5165dcd56e2356156312df221c991711
 +  sha1: sha256:698a75d760d571038cd0d111e57eee9d6ab662f8ef7ef1d5a32bc2544f7f0c74
 +  packages: []
 +packages:
 +- name: cerebro
 +  version: c44f6d7c7c4ccfc5142f4cd6447a0087249028eeea00874cc03430e8d57f82ab
 +  fingerprint: c44f6d7c7c4ccfc5142f4cd6447a0087249028eeea00874cc03430e8d57f82ab
 +  sha1: sha256:cf31d9e65b2c2bf7d1916f2f96abaf3225e5758ad64b5614fbf044d573d6ca4a
 +  dependencies: []
 +- name: curator
 +  version: 86c5c2302a0c376bef9d3334508e57d89431e3ea96486d5e0763ab2fe2a9abf7
 +  fingerprint: 86c5c2302a0c376bef9d3334508e57d89431e3ea96486d5e0763ab2fe2a9abf7
 +  sha1: sha256:4e9ab0fefc2032e2f17e36e3099b94a72a092e4551951b856dc343f0125ddb89
 +  dependencies:
 +  - python3
 +- name: elasticsearch
 +  version: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +  fingerprint: 07ad6c1441f79fb2dd691e066aee1ef9c71a072d60bd0166a7b1684a59a97037
 +  sha1: sha256:a946105a304aff03b30b3b062f95368be466f856e50aa8542c0e3044c03b4758
 +  dependencies: []
 +- name: haproxy
 +  version: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  fingerprint: b9189484ff6f4d87259e299f9771998abe4d0ffd0a7dd21d941c6c7cc7d8b58a
 +  sha1: sha256:b0d344ae781133b10b392fa0eabd11e6c6b1603b7bf3cdbddc0a336a9cf32e30
 +  dependencies: []
 +- name: java8
 +  version: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +  fingerprint: f3648d32d8ec78b6758bf9709445ae584492949cbe7a208b79827f76d05d821d
 +  sha1: sha256:5e9c769fb42822b0e33ecc21fc50a4f8584e399a45ccf33b2cc99a96372d1a30
 +  dependencies: []
 +- name: kibana
 +  version: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +  fingerprint: 844831ac7b3989088b3ad87e95b55a0ddfbcf3807160b7472eba92517be65c75
 +  sha1: sha256:da12681a7d036eec956e55b8f3d53129668cdbcef27854caf09f9ecedc96eed5
 +  dependencies: []
 +- name: logsearch-config
 +  version: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +  fingerprint: 8d89adae695dfd3ab3772b72ae8b9eaaba7bc0902bcc6614f69bc368b380ecc3
 +  sha1: sha256:e4f0707a47ee273cf9ef11574b7c310f5df24fbca792d7465f69404506373d16
 +  dependencies:
 +  - ruby2.3
 +- name: logstash
 +  version: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +  fingerprint: 6c55cc08a0ff0e19e7e0f9449c8954de8f8152a9cb3f9b91e60ede07f4441e42
 +  sha1: sha256:d2feb130384b4b2345b75ac9bb4fd95bc38329433cdb468c4cfd043f04553714
 +  dependencies:
 +  - java8
 +- name: nats_to_syslog
 +  version: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  fingerprint: 87900e9a2c72f55d7ab346d7819184e21338f2d9b5ff285bcdfb8210b303bbe1
 +  sha1: sha256:65d55addd7aa5a479cbf1e48ccd4cc03aaf0d82477497107eecab569ddf40115
 +  dependencies: []
 +- name: python3
 +  version: 850f5cf587498a0d127464f069b8599593b42ee4fdf381efb62cc309ed19760a
 +  fingerprint: 850f5cf587498a0d127464f069b8599593b42ee4fdf381efb62cc309ed19760a
 +  sha1: sha256:154272da05fae241a02284c16c98280446f3f8897770c72132a11d2b25b608dd
 +  dependencies: []
 +- name: ruby2.3
 +  version: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  fingerprint: 829cbedc82964dd880f3323d5386680ce0eba6bbd8ab9b84eca2d1902f6d2d7d
 +  sha1: sha256:2f4deb31c7642d4bded2623e47332a393cc98b7a060b732d6084de0ab52c7b09
 +  dependencies: []
 +license:
 +  version: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  fingerprint: 8910375e1e02230324d26e31e72d340b121830d0dbd7071dce92fbe27e97a779
 +  sha1: sha256:dec582b855538894e263d430fe548182687082ecc17a9275a003e88fdeb3a2f6
 diff --git cloud.gov/src/elasticsearch-utils/rolling-restart cloudfoundry-community/src/elasticsearch-utils/rolling-restart
 index 1f5762b..dccaedf 100755
 --- cloud.gov/src/elasticsearch-utils/rolling-restart
 +++ cloudfoundry-community/src/elasticsearch-utils/rolling-restart
 @@ -55,25 +55,25 @@ for NODEREF in $( curl -s "${CLUSTER}/_cat/nodes?h=host,node.role,master,name" |
 
   decho "  > disabling allocations"
 
 -  curl -s -H 'Content-Type: application/json' -X PUT -d @- "${CLUSTER}/_cluster/settings" > /dev/null <<EOF
 +  curl -s -X PUT -d @- "${CLUSTER}/_cluster/settings" > /dev/null <<EOF
 {"transient":{"cluster.routing.allocation.enable":"primaries"}}
 EOF
 -
 +  
 
   decho "  > sending shutdown to ${NODE}"
 
   curl -s -X POST "${CLUSTER}/_cluster/nodes/${NODE}/_shutdown" > /dev/null
 -
 +  
 
   decho "  > waiting for node to leave"
 -
 +  
   while curl -s "${CLUSTER}/_cat/nodes?h=host" | grep "${NODE}" > /dev/null ; do
     sleep 2
   done
 -
 +  
 
   decho "  > waiting for node to rejoin"
 -
 +  
   while ! curl -s --retry 8 "${CLUSTER}/_cat/nodes?h=host" | grep "${NODE}" > /dev/null ; do
     sleep 2
   done
 diff --git cloud.gov/templates/logsearch-deployment.yml cloudfoundry-community/templates/logsearch-deployment.yml
 deleted file mode 100644
 index e2469d5..0000000
 --- cloud.gov/templates/logsearch-deployment.yml
 +++ /dev/null
 @@ -1,89 +0,0 @@
 -meta:
 -  default_env:
 -    # Default vcap & root password on deployed VMs (ie c1oudc0w)
 -    # Generated using mkpasswd -m sha-512
 -    bosh:
 -      password: "$6$4gDD3aV0rdqlrKC$2axHCxGKIObs6tAmMTqYCspcdvQXh3JJcvWOY2WGb4SrdXtnCyNaWlrf3WEqvYR2MYizEGp3kMmbpwBC6jsHt0"
 -
 -name: logsearch
 -
 -compilation:
 -  workers: 4
 -  network: default
 -  reuse_compilation_vms: true
 -  cloud_properties: {}
 -
 -resource_pools:
 -- name: elasticsearch_master
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: elasticsearch_data
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: ingestor
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: kibana
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: maintenance
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: cluster_monitor
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: haproxy
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -- name: errand
 -  network: default
 -  stemcell: (( grab meta.stemcell ))
 -  env: (( grab meta.default_env ))
 -  cloud_properties: {}
 -
 -disk_pools:
 -- name: elasticsearch_master
 -  disk_size: 102400
 -  cloud_properties: {}
 -
 -- name: elasticsearch_data
 -  disk_size: 102400
 -  cloud_properties: {}
 -
 -- name: ingestor
 -  disk_size: 2048
 -  cloud_properties: {}
 -
 -- name: cluster_monitor
 -  disk_size: 102400
 -  cloud_properties: {}
 -
 -update:
 -  serial: false
 -  canaries: 1
 -  canary_watch_time: 30000-600000
 -  update_watch_time: 5000-600000
 -  max_in_flight: 1
 -  max_errors: 1
 -
 diff --git cloud.gov/templates/logsearch-infrastructure-aws.yml cloudfoundry-community/templates/logsearch-infrastructure-aws.yml
 deleted file mode 100644
 index 4c64fb7..0000000
 --- cloud.gov/templates/logsearch-infrastructure-aws.yml
 +++ /dev/null
 @@ -1,68 +0,0 @@
 -meta:
 -  stemcell:
 -    name: bosh-aws-xen-hvm-ubuntu-trusty-go_agent
 -    version: latest
 -
 -compilation:
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: c4.large
 -
 -resource_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: t2.micro
 -
 -- name: elasticsearch_data
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: m3.medium
 -
 -- name: ingestor
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: t2.micro
 -
 -- name: kibana
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: t2.micro
 -
 -- name: maintenance
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: t2.micro
 -
 -- name: cluster_monitor
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: m4.large
 -
 -- name: haproxy
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: t2.micro
 -
 -- name: errand
 -  cloud_properties:
 -    availability_zone: us-west-2c
 -    instance_type: t2.micro
 -
 -disk_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    type: gp2
 -
 -- name: elasticsearch_data
 -  cloud_properties:
 -    type: gp2
 -
 -- name: ingestor
 -  cloud_properties:
 -    type: gp2
 -
 -- name: cluster_monitor
 -  cloud_properties:
 -    type: gp2
 -
 diff --git cloud.gov/templates/logsearch-infrastructure-gcp.yml cloudfoundry-community/templates/logsearch-infrastructure-gcp.yml
 deleted file mode 100644
 index 5b1da7a..0000000
 --- cloud.gov/templates/logsearch-infrastructure-gcp.yml
 +++ /dev/null
 @@ -1,78 +0,0 @@
 -meta:
 -  stemcell:
 -    name: bosh-google-kvm-ubuntu-trusty-go_agent
 -    version: latest
 -
 -compilation:
 -  cloud_properties:
 -    machine_type: n1-standard-8
 -    root_disk_size_gb: 100
 -    root_disk_type: pd-ssd
 -    preemptible: true
 -
 -resource_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    machine_type: n1-standard-1
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: elasticsearch_data
 -  cloud_properties:
 -    machine_type: n1-standard-2
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: ingestor
 -  cloud_properties:
 -    machine_type: n1-standard-1
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: kibana
 -  cloud_properties:
 -    machine_type: n1-standard-1
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: maintenance
 -  cloud_properties:
 -    machine_type: n1-standard-1
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: cluster_monitor
 -  cloud_properties:
 -    machine_type: n1-standard-2
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: haproxy
 -  cloud_properties:
 -    machine_type: n1-standard-1
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -- name: errand
 -  cloud_properties:
 -    machine_type: n1-standard-1
 -    root_disk_size_gb: 8
 -    root_disk_type: pd-ssd
 -
 -disk_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    type: pd-ssd
 -
 -- name: elasticsearch_data
 -  cloud_properties:
 -    type: pd-ssd
 -
 -- name: ingestor
 -  cloud_properties:
 -    type: pd-ssd
 -
 -- name: cluster_monitor
 -  cloud_properties:
 -    type: pd-ssd
 -
 diff --git cloud.gov/templates/logsearch-infrastructure-openstack.yml cloudfoundry-community/templates/logsearch-infrastructure-openstack.yml
 deleted file mode 100644
 index b55a99c..0000000
 --- cloud.gov/templates/logsearch-infrastructure-openstack.yml
 +++ /dev/null
 @@ -1,57 +0,0 @@
 -compilation:
 -  cloud_properties:
 -    instance_type: (( grab meta.instance_type.compilation || "m1.small" ))
 -
 -resource_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.elasticsearch || "m1.medium" ))
 -
 -- name: elasticsearch_data
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.elasticsearch || "m1.medium" ))
 -
 -- name: ingestor
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.ingestor || "m1.small" ))
 -
 -- name: kibana
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.kibana || "m1.small" ))
 -
 -- name: maintenance
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.maintenance || "m1.small" ))
 -
 -- name: cluster_monitor
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.monitor || "m1.small" ))
 -
 -- name: haproxy
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.haproxy || "m1.small" ))
 -
 -- name: errand
 -  cloud_properties:
 -    availability_zone: (( grab meta.availability_zone ))
 -    instance_type: (( grab meta.instance_type.errand || "m1.small" ))
 -
 -disk_pools:
 -- name: elasticsearch_master
 -  disk_size: 10240
 -
 -- name: elasticsearch_data
 -  disk_size: 10240
 -
 -- name: ingestor
 -  disk_size: 2048
 -
 -- name: cluster_monitor
 -  disk_size: 10240
 diff --git cloud.gov/templates/logsearch-infrastructure-vsphere.yml cloudfoundry-community/templates/logsearch-infrastructure-vsphere.yml
 deleted file mode 100644
 index 08cd11a..0000000
 --- cloud.gov/templates/logsearch-infrastructure-vsphere.yml
 +++ /dev/null
 @@ -1,60 +0,0 @@
 -compilation:
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -meta:
 -  stemcell:
 -    name: bosh-vsphere-esxi-ubuntu-trusty-go_agent
 -    version: latest
 -
 -resource_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: elasticsearch_data
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: ingestor
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: maintenance
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: kibana
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: cluster_monitor
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: haproxy
 -  cloud_properties:
 -    ram: 4096
 -    disk: 30000
 -    cpu: 2
 -
 -- name: errand
 -  cloud_properties:
 -    ram: 1024
 -    disk: 30000
 -    cpu: 2
 -
 diff --git cloud.gov/templates/logsearch-infrastructure-warden.yml cloudfoundry-community/templates/logsearch-infrastructure-warden.yml
 deleted file mode 100644
 index 4d24b21..0000000
 --- cloud.gov/templates/logsearch-infrastructure-warden.yml
 +++ /dev/null
 @@ -1,438 +0,0 @@
 ----
 -meta:
 -  stemcell:
 -    name: bosh-warden-boshlite-ubuntu-trusty-go_agent
 -    version: latest
 -
 -update:
 -  canaries: 1
 -  max_in_flight: 50
 -  canary_watch_time: 1000-600000
 -  update_watch_time: 1000-600000
 -  serial: false
 -
 -properties:
 -  elasticsearch:
 -    exec:
 -      environment:
 -        ES_HEAP_SIZE: 500000K
 -
 -networks:
 -- name: default
 -  subnets:
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.0/30
 -    reserved:
 -    - 10.244.1.1
 -    static:
 -    - 10.244.1.2
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.4/30
 -    reserved:
 -    - 10.244.1.5
 -    static:
 -    - 10.244.1.6
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.8/30
 -    reserved:
 -    - 10.244.1.9
 -    static:
 -    - 10.244.1.10
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.12/30
 -    reserved:
 -    - 10.244.1.13
 -    static:
 -    - 10.244.1.14
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.16/30
 -    reserved:
 -    - 10.244.1.17
 -    static:
 -    - 10.244.1.18
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.20/30
 -    reserved:
 -    - 10.244.1.21
 -    static:
 -    - 10.244.1.22
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.24/30
 -    reserved:
 -    - 10.244.1.25
 -    static:
 -    - 10.244.1.26
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.28/30
 -    reserved:
 -    - 10.244.1.29
 -    static:
 -    - 10.244.1.30
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.32/30
 -    reserved:
 -    - 10.244.1.33
 -    static:
 -    - 10.244.1.34
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.36/30
 -    reserved:
 -    - 10.244.1.37
 -    static:
 -    - 10.244.1.38
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.40/30
 -    reserved:
 -    - 10.244.1.41
 -    static:
 -    - 10.244.1.42
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.44/30
 -    reserved:
 -    - 10.244.1.45
 -    static:
 -    - 10.244.1.46
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.48/30
 -    reserved:
 -    - 10.244.1.49
 -    static:
 -    - 10.244.1.50
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.52/30
 -    reserved:
 -    - 10.244.1.53
 -    static:
 -    - 10.244.1.54
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.56/30
 -    reserved:
 -    - 10.244.1.57
 -    static:
 -    - 10.244.1.58
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.60/30
 -    reserved:
 -    - 10.244.1.61
 -    static:
 -    - 10.244.1.62
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.64/30
 -    reserved:
 -    - 10.244.1.65
 -    static:
 -    - 10.244.1.66
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.68/30
 -    reserved:
 -    - 10.244.1.69
 -    static:
 -    - 10.244.1.70
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.72/30
 -    reserved:
 -    - 10.244.1.73
 -    static:
 -    - 10.244.1.74
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.76/30
 -    reserved:
 -    - 10.244.1.77
 -    static:
 -    - 10.244.1.78
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.80/30
 -    reserved:
 -    - 10.244.1.81
 -    static:
 -    - 10.244.1.82
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.84/30
 -    reserved:
 -    - 10.244.1.85
 -    static:
 -    - 10.244.1.86
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.88/30
 -    reserved:
 -    - 10.244.1.89
 -    static:
 -    - 10.244.1.90
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.92/30
 -    reserved:
 -    - 10.244.1.93
 -    static:
 -    - 10.244.1.94
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.96/30
 -    reserved:
 -    - 10.244.1.97
 -    static:
 -    - 10.244.1.98
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.100/30
 -    reserved:
 -    - 10.244.1.101
 -    static:
 -    - 10.244.1.102
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.104/30
 -    reserved:
 -    - 10.244.1.105
 -    static:
 -    - 10.244.1.106
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.108/30
 -    reserved:
 -    - 10.244.1.109
 -    static:
 -    - 10.244.1.110
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.112/30
 -    reserved:
 -    - 10.244.1.113
 -    static:
 -    - 10.244.1.114
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.116/30
 -    reserved:
 -    - 10.244.1.117
 -    static:
 -    - 10.244.1.118
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.120/30
 -    reserved:
 -    - 10.244.1.121
 -    static:
 -    - 10.244.1.122
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.124/30
 -    reserved:
 -    - 10.244.1.125
 -    static:
 -    - 10.244.1.126
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.128/30
 -    reserved:
 -    - 10.244.1.129
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.132/30
 -    reserved:
 -    - 10.244.1.133
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.136/30
 -    reserved:
 -    - 10.244.1.137
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.140/30
 -    reserved:
 -    - 10.244.1.141
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.144/30
 -    reserved:
 -    - 10.244.1.145
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.148/30
 -    reserved:
 -    - 10.244.1.149
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.152/30
 -    reserved:
 -    - 10.244.1.153
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.156/30
 -    reserved:
 -    - 10.244.1.157
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.160/30
 -    reserved:
 -    - 10.244.1.161
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.164/30
 -    reserved:
 -    - 10.244.1.165
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.168/30
 -    reserved:
 -    - 10.244.1.169
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.172/30
 -    reserved:
 -    - 10.244.1.173
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.176/30
 -    reserved:
 -    - 10.244.1.177
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.180/30
 -    reserved:
 -    - 10.244.1.181
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.184/30
 -    reserved:
 -    - 10.244.1.185
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.188/30
 -    reserved:
 -    - 10.244.1.189
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.192/30
 -    reserved:
 -    - 10.244.1.193
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.196/30
 -    reserved:
 -    - 10.244.1.197
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.200/30
 -    reserved:
 -    - 10.244.1.201
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.204/30
 -    reserved:
 -    - 10.244.1.205
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.208/30
 -    reserved:
 -    - 10.244.1.209
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.212/30
 -    reserved:
 -    - 10.244.1.213
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.216/30
 -    reserved:
 -    - 10.244.1.217
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.220/30
 -    reserved:
 -    - 10.244.1.221
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.224/30
 -    reserved:
 -    - 10.244.1.225
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.228/30
 -    reserved:
 -    - 10.244.1.229
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.232/30
 -    reserved:
 -    - 10.244.1.233
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.236/30
 -    reserved:
 -    - 10.244.1.237
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.240/30
 -    reserved:
 -    - 10.244.1.241
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.244/30
 -    reserved:
 -    - 10.244.1.245
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.248/30
 -    reserved:
 -    - 10.244.1.249
 -    static: []
 -  - cloud_properties:
 -      name: random
 -    range: 10.244.1.252/30
 -    reserved:
 -    - 10.244.1.253
 -    static: []
 diff --git cloud.gov/templates/logsearch-jobs.yml cloudfoundry-community/templates/logsearch-jobs.yml
 deleted file mode 100644
 index f72fd87..0000000
 --- cloud.gov/templates/logsearch-jobs.yml
 +++ /dev/null
 @@ -1,269 +0,0 @@
 -releases:
 -- name: logsearch
 -  version: latest
 -
 -jobs:
 -###############################################################################
 -#First deploy group - elasticsearch_master, cluster_monitor, maintenance
 -###############################################################################
 -- name: elasticsearch_master
 -  instances: 1
 -  templates:
 -  - { name: elasticsearch, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: cerebro, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: syslog_forwarder, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  resource_pool: elasticsearch_master
 -  persistent_disk_pool: elasticsearch_master
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(0) ))
 -  properties:
 -    elasticsearch:
 -      node:
 -        allow_master: true
 -        allow_data: false
 -    cerebro:
 -      secret: (( param "specify cerebro secret key" ))
 -    syslog_forwarder:
 -      config:
 -      - {service: elasticsearch, file: /var/vcap/sys/log/elasticsearch/elasticsearch.stdout.log}
 -      - {service: elasticsearch, file: /var/vcap/sys/log/elasticsearch/elasticsearch.stderr.log}
 -  update:
 -    max_in_flight: 1 # Should never update more than one ES master node at a time or cluster will go down
 -
 -- name: cluster_monitor
 -  instances: 1
 -  templates:
 -  - { release: logsearch, name: ingestor_syslog }
 -  - { release: logsearch, name: elasticsearch, consumes: {elasticsearch: nil} }
 -  - { release: logsearch, name: elasticsearch_config, consumes: {elasticsearch: nil} }
 -  - { release: logsearch, name: curator, consumes: {elasticsearch: nil} }
 -  - { release: logsearch, name: kibana, consumes: {elasticsearch: nil} }
 -  - { release: logsearch, name: nats_to_syslog, consumes: {syslog_forwarder: nil} }
 -  resource_pool: cluster_monitor
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(2) ))
 -  persistent_disk_pool: cluster_monitor
 -  properties:
 -    kibana:
 -      port: 5601
 -      elasticsearch:
 -        host: 127.0.0.1
 -        port: 9200
 -      memory_limit: 30
 -      wait_for_templates: [shards-and-replicas]
 -    elasticsearch:
 -      master_hosts: [127.0.0.1]
 -      cluster_name: monitor
 -      node:
 -        allow_master: true
 -        allow_data: true
 -    redis:
 -      host: 127.0.0.1
 -      maxmemory: 10
 -    curator:
 -      elasticsearch:
 -        host: 127.0.0.1
 -        port: 9200
 -      purge_logs:
 -        retention_period: 7
 -    elasticsearch_config:
 -      elasticsearch:
 -        host: 127.0.0.1
 -        port: 9200
 -      index_prefix: "logstash-"
 -      templates:
 -        - shards-and-replicas: "{ \"template\" : \"logstash-*\", \"order\" : 100, \"settings\" : { \"number_of_shards\" : 1, \"number_of_replicas\" : 0 } }"
 -        - index-settings: /var/vcap/jobs/elasticsearch_config/index-templates/index-settings.json
 -        - index-mappings: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings.json
 -    logstash_parser:
 -      logstash_parser.elasticsearch.index: "logstash-%{+YYYY.MM.dd}"
 -      filters:
 -      - monitor: /var/vcap/packages/logsearch-config/logstash-filters-monitor.conf
 -    nats_to_syslog:
 -      debug: true
 -    logstash_ingestor:
 -      syslog:
 -        port: 5514
 -
 -- name: maintenance
 -  instances: 1
 -  templates:
 -  - { name: elasticsearch_config, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: curator, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: syslog_forwarder, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  resource_pool: maintenance
 -  networks:
 -  - name: default
 -  update:
 -    serial: true # Block on this job to create deploy group 1
 -  properties:
 -    syslog_forwarder:
 -      config:
 -      - {service: curator, file: /var/vcap/sys/log/curator/curator.log}
 -      - {service: elasticsearch_config, file: /var/vcap/sys/log/elasticsearch_config/job.control.log}
 -
 -##################################################################
 -#2nd deploy group - elasticsearch_data, kibana, ingestors
 -##################################################################
 -
 -- name: elasticsearch_data
 -  instances: 2
 -  templates:
 -  - { name: elasticsearch, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: syslog_forwarder, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  resource_pool: elasticsearch_data
 -  persistent_disk_pool: elasticsearch_data
 -  networks:
 -  - name: default
 -  properties:
 -    elasticsearch:
 -      node:
 -        allow_master: false
 -        allow_data: true
 -    syslog_forwarder:
 -      config:
 -      - {service: elasticsearch, file: /var/vcap/sys/log/elasticsearch/elasticsearch.stdout.log}
 -      - {service: elasticsearch, file: /var/vcap/sys/log/elasticsearch/elasticsearch.stderr.log}
 -  update:
 -    serial: true
 -    max_in_flight: 1 # Only update 1 ES data node at a time or risk downtime
 -
 -- name: kibana
 -  instances: 1
 -  templates:
 -  - { name: kibana, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: syslog_forwarder, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  - { name: elasticsearch, release: logsearch, consumes: {elasticsearch: nil} }
 -  resource_pool: kibana
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(5) ))
 -  properties:
 -    syslog_forwarder:
 -      config:
 -      - {service: kibana, file: /var/vcap/sys/log/kibana/kibana.stdout.log}
 -      - {service: kibana, file: /var/vcap/sys/log/kibana/kibana.stderr.log}
 -
 -- name: ingestor
 -  instances: 1
 -  templates:
 -  - { name: elasticsearch, release: logsearch, consumes: {elasticsearch: nil} }
 -  - { name: ingestor_syslog, release: logsearch }
 -  - { name: syslog_forwarder, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  resource_pool: ingestor
 -  persistent_disk_pool: ingestor
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(1) ))
 -  properties:
 -    logstash_ingestor:
 -      debug: false
 -      relp:
 -        port: ~
 -    syslog_forwarder:
 -      config:
 -      - {service: elasticsearch, file: /var/vcap/sys/log/elasticsearch/elasticsearch.stdout.log}
 -      - {service: elasticsearch, file: /var/vcap/sys/log/elasticsearch/elasticsearch.stderr.log}
 -      - {service: ingestor_syslog, file: /var/vcap/sys/log/ingestor_syslog/ingestor_syslog.stdout.log}
 -      - {service: ingestor_syslog, file: /var/vcap/sys/log/ingestor_syslog/ingestor_syslog.stderr.log}
 -
 -- name: ingestor-bosh-nats
 -  instances: 0
 -  templates:
 -  - { name: ingestor_syslog, release: logsearch }
 -  - { name: nats_to_syslog, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  - { name: syslog_forwarder, release: logsearch, consumes: {syslog_forwarder: nil} }
 -  resource_pool: ingestor
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(4) ))
 -  properties:
 -    logstash_ingestor:
 -      syslog:
 -        port: 5514
 -    syslog_forwarder:
 -      config:
 -      - {service: nats_to_syslog, file: /var/vcap/sys/log/nats_to_syslog/nats_to_syslog.stdout.log}
 -      - {service: nats_to_syslog, file: /var/vcap/sys/log/nats_to_syslog/nats_to_syslog.stderr.log}
 -
 -####################################################
 -#3rd deploy group - ls-router (haproxy), and errands
 -####################################################
 -
 -- name: ls-router
 -  instances: 1
 -  templates:
 -  - { name: haproxy, release: logsearch, consumes: {elasticsearch: nil, syslog_forwarder: nil, kibana: nil, ingestor: nil} }
 -  resource_pool: haproxy
 -  networks:
 -  - name: default
 -    default: [gateway, dns]
 -    static_ips: (( static_ips(9) ))
 -  properties:
 -    haproxy:
 -      syslog_server: (( grab jobs.cluster_monitor.networks.[0].static_ips.[0] ))
 -      ingestor:
 -        backend_servers: (( grab jobs.ingestor.networks.[0].static_ips ))
 -      kibana:
 -        backend_servers: (( grab jobs.kibana.networks.[0].static_ips ))
 -      cluster_monitor:
 -        backend_servers: (( grab jobs.cluster_monitor.networks.[0].static_ips ))
 -
 -- name: smoke-tests
 -  instances: 1
 -  resource_pool: errand
 -  release: logsearch
 -  templates:
 -  - { name: smoke-tests, release: logsearch , consumes: {elasticsearch: nil} }
 -  consumes: {elasticsearch: nil}
 -  networks:
 -  - name: default
 -  lifecycle: errand
 -  properties:
 -    smoke_tests:
 -      syslog_ingestor:
 -        host: (( grab jobs.ls-router.networks.[0].static_ips.[0] ))
 -        port: (( grab jobs.ls-router.properties.haproxy.ingestor.inbound_port || properties.haproxy.ingestor.inbound_port || 5514 ))
 -      elasticsearch_master:
 -        host: (( grab jobs.elasticsearch_master.networks.default.static_ips.[0] ))
 -
 -# Global properties
 -properties:
 -  curator:
 -    purge_logs:
 -      unit: days
 -      retention_period: 30
 -    elasticsearch:
 -      hosts: (( grab jobs.elasticsearch_master.networks.default.static_ips ))
 -      port: 9200
 -  logstash_parser:
 -    debug: false
 -  logstash_ingestor:
 -    debug: false
 -  elasticsearch:
 -    master_hosts: (( grab jobs.elasticsearch_master.networks.default.static_ips ))
 -    cluster_name: logsearch
 -    exec: ~
 -  elasticsearch_config:
 -    elasticsearch:
 -      host: (( grab jobs.elasticsearch_master.networks.default.static_ips.[0] ))
 -    templates:
 -      - shards-and-replicas: /var/vcap/jobs/elasticsearch_config/index-templates/shards-and-replicas.json
 -      - index-settings: /var/vcap/jobs/elasticsearch_config/index-templates/index-settings.json
 -      - index-mappings: /var/vcap/jobs/elasticsearch_config/index-templates/index-mappings.json
 -  syslog_forwarder:
 -    host: (( grab jobs.cluster_monitor.networks.default.static_ips.[0] ))
 -    port: (( grab jobs.cluster_monitor.properties.logstash_ingestor.syslog.port ))
 -  nats_to_syslog:
 -    # NATS settings of the Bosh Director
 -    nats:
 -      subject: ">"
 -      user: nats
 -      password: nats-password
 -      port: 4222
 -      machines: [10.0.16.5]
 -    syslog:
 -        host: 127.0.0.1
 -        port: 5514
 diff --git cloud.gov/templates/stub.aws.example.yml cloudfoundry-community/templates/stub.aws.example.yml
 deleted file mode 100644
 index f313d3d..0000000
 --- cloud.gov/templates/stub.aws.example.yml
 +++ /dev/null
 @@ -1,76 +0,0 @@
 -meta:
 -  stemcell:
 -    name: bosh-aws-xen-hvm-ubuntu-trusty-go_agent
 -    version: latest
 -
 -releases:
 -- name: logsearch
 -  version: latest
 -
 -name: logsearch
 -director_uuid: VAR_UUID # BOSH UUID
 -
 -jobs:
 -# Deploy group 1
 -- name: elasticsearch_master
 -  instances: 1
 -
 -- name: cluster_monitor
 -  instances: 1
 -
 -- name: maintenance
 -  instances: 1
 -
 -# Deploy group 2
 -- name: elasticsearch_data
 -  instances: 2
 -
 -- name: kibana
 -  instances: 1
 -
 -- name: ingestor
 -  instances: 1
 -
 -- name: ingestor-bosh-nats
 -  instances: 1
 -
 -# Deploy group 3
 -- name: ls-router
 -  instances: 1
 -
 -properties:
 -  nats_to_syslog:
 -    # Specify the NATS settings of the Bosh Director
 -    nats:
 -      user: VAR_NATS_USER  # Specify NATS user
 -      password: VAR_NATS_PASS  # Specify NATS password
 -      port: 4222  # Default value
 -      machines: [VAR_NATS_IP]  # Specify your NATS IPs
 -
 -
 -disk_pools:
 -- name: elasticsearch_master
 -  disk_size: 102400
 -- name: elasticsearch_data
 -  disk_size: 512000
 -- name: ingestor
 -  disk_size: 2048
 -- name: cluster_monitor
 -  disk_size: 102400
 -
 -networks:
 -- name: default
 -  type: manual
 -  subnets:
 -  - range: VAR_CF1_NET_RANGE
 -    gateway: VAR_CF1_NET_GW
 -    cloud_properties:
 -      subnet: VAR_CF1_SUBNET  # Specify your subnetwork ID
 -      security_groups: [bosh, logsearch]
 -    dns:
 -    - VAR_CF1_DNS_1
 -    - VAR_CF1_DNS_2
 -    reserved:
 -    - 192.168.1.2 - 192.168.1.95
 -    static:
 -    - 192.168.1.96 - 192.168.1.120
 diff --git cloud.gov/templates/stub.gcp.example.yml cloudfoundry-community/templates/stub.gcp.example.yml
 deleted file mode 100644
 index f9a4994..0000000
 --- cloud.gov/templates/stub.gcp.example.yml
 +++ /dev/null
 @@ -1,118 +0,0 @@
 -meta:
 -  stemcell:
 -    name: bosh-google-kvm-ubuntu-trusty-go_agent
 -    version: latest
 -
 -releases:
 -- name: logsearch
 -  version: latest
 -
 -name: logsearch
 -director_uuid: VAR_UUID # BOSH UUID
 -
 -compilation:
 -  cloud_properties:
 -    zone: europe-west1-d
 -
 -resource_pools:
 -- name: elasticsearch_master
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: elasticsearch_data
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: ingestor
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: kibana
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: maintenance
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: cluster_monitor
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: haproxy
 -  cloud_properties:
 -    zone: europe-west1-d
 -- name: errand
 -  cloud_properties:
 -    zone: europe-west1-d
 -
 -jobs:
 -# Deploy group 1
 -- name: elasticsearch_master
 -  instances: 1
 -
 -- name: cluster_monitor
 -  instances: 1
 -
 -- name: maintenance
 -  instances: 1
 -
 -# Deploy group 2
 -- name: elasticsearch_data
 -  instances: 2
 -
 -- name: kibana
 -  instances: 1
 -
 -- name: ingestor
 -  instances: 1
 -
 -- name: ingestor-bosh-nats
 -  instances: 1
 -
 -# Deploy group 3
 -- name: ls-router
 -  instances: 1
 -  cloud_properties:
 -    tags:
 -    - logsearch-router
 -  #networks:
 -  #- (( merge ))
 -  #- name: elastic
 -  #  static_ips:
 -  #  - MY-ELASTIC-IP # Specify an elastic IP for the router. Resources, proxied by the router, will be available through this IP. They include: kibana, elasticsearch, cluster_monitor, ingestor and syslog_server.
 -
 -properties:
 -  nats_to_syslog:
 -    # Specify the NATS settings of the Bosh Director
 -    nats:
 -      user: VAR_NATS_USER  # Specify NATS user
 -      password: VAR_NATS_PASS  # Specify NATS password
 -      port: 4222  # Default value
 -      machines: [VAR_NATS_IP]  # Specify your NATS IPs
 -
 -disk_pools:
 -- name: elasticsearch_master
 -  disk_size: 51200
 -- name: elasticsearch_data
 -  disk_size: 256000
 -- name: ingestor
 -  disk_size: 2048
 -- name: cluster_monitor
 -  disk_size: 51200
 -
 -networks:
 -- name: default
 -  type: manual
 -  subnets:
 -  - range: VAR_CF1_NET_RANGE
 -    gateway: VAR_CF1_NET_GW 
 -    cloud_properties:
 -  #    zone: europe-west1-d
 -      network_name: cf
 -      subnetwork_name: logsearch 
 -      tags:
 -      - bosh-internal
 -      - logsearch-internal
 -    static:
 -    - 10.201.0.2 - 10.201.0.253
 -- name: elastic
 -  type: vip
 -  cloud_properties:
 -    security_groups:  # Specify your security groups used for 'elastic' network
 -    - bosh
 -    - logsearch
 diff --git cloud.gov/templates/stub.openstack.example.yml cloudfoundry-community/templates/stub.openstack.example.yml
 deleted file mode 100644
 index ccfec10..0000000
 --- cloud.gov/templates/stub.openstack.example.yml
 +++ /dev/null
 @@ -1,109 +0,0 @@
 -meta:
 -  availability_zone: nova
 -  instance_type:
 -    compilation: m1.medium
 -    elasticsearch: m1.medium
 -    ingestor: m1.small
 -    kibana: m1.small
 -    maintenance: m1.small
 -    monitor: m1.small
 -    haproxy: m1.small
 -    errand: m1.small
 -  stemcell:
 -    name: bosh-openstack-kvm-ubuntu-trusty-go_agent
 -    version: latest
 -
 -releases:
 -- name: logsearch
 -  version: latest
 -
 -name: logsearch
 -director_uuid: VAR_UUID # BOSH UUID
 -
 -jobs:
 -# Deploy group 1
 -- name: elasticsearch_master
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(0) ))
 -  resource_pool: elasticsearch_master
 -  persistent_disk_pool: elasticsearch_master
 -
 -- name: cluster_monitor
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(2) ))
 -  resource_pool: cluster_monitor
 -
 -# Deploy group 2
 -- name: elasticsearch_data
 -  instances: 2
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(16, 17) ))
 -  resource_pool: elasticsearch_data
 -  persistent_disk_pool: elasticsearch_data
 -
 -- name: kibana
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(8) ))
 -  resource_pool: kibana
 -
 -- name: ingestor
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(1) ))
 -  resource_pool: ingestor
 -
 -- name: ingestor-bosh-nats
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(4) ))
 -  resource_pool: ingestor
 -
 -# Deploy group 3
 -- name: maintenance
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(6) ))
 -  resource_pool: maintenance
 -
 -- name: ls-router
 -  instances: 1
 -  networks:
 -  - name: default
 -    static_ips: (( static_ips(5) ))
 -  resource_pool: haproxy
 -
 -properties:
 -  nats_to_syslog:
 -    # Specify the NATS settings of the Bosh Director
 -    nats:
 -      user: VAR_NATS_USER  # Specify NATS user
 -      password: VAR_NATS_PASS  # Specify NATS password
 -      port: 4222  # Default value
 -      machines: [VAR_NATS_IP]  # Specify your NATS IPs
 -
 -networks:
 -- name: default
 -  type: manual
 -  subnets:
 -  - range: VAR_CF1_NET_RANGE
 -    gateway: VAR_CF1_NET_GW
 -    cloud_properties:
 -      net_id: VAR_CF1_NET_ID  # Specify your network ID
 -      security_groups: [bosh, logsearch]
 -    dns:
 -    - VAR_CF1_DNS_1
 -    - VAR_CF1_DNS_2
 -    reserved:
 -    - 192.168.1.2 - 192.168.1.95
 -    static:
 -    - 192.168.1.96 - 192.168.1.120
 diff --git cloud.gov/templates/stub.vsphere.example.yml cloudfoundry-community/templates/stub.vsphere.example.yml
 deleted file mode 100644
 index 6800257..0000000
 --- cloud.gov/templates/stub.vsphere.example.yml
 +++ /dev/null
 @@ -1,58 +0,0 @@
 -releases:
 -- name: logsearch
 -  version: latest
 -
 -name: logsearch
 -director_uuid: VAR_UUID # BOSH UUID
 -
 -
 -jobs:
 -# Deploy group 1
 -- name: elasticsearch_master
 -  instances: 1
 -
 -- name: cluster_monitor
 -  instances: 1
 -
 -- name: maintenance
 -  instances: 1
 -
 -# Deploy group 2
 -- name: elasticsearch_data
 -  instances: 2
 -
 -- name: kibana
 -  instances: 1
 -
 -- name: ingestor
 -  instances: 1
 -
 -# Deploy group 3
 -- name: ls-router
 -  instances: 1
 -
 -properties:
 -  nats_to_syslog:
 -    # Specify the NATS settings of the Bosh Director
 -    nats:
 -      user: VAR_NATS_USER  # Specify NATS user
 -      password: VAR_NATS_PASS  # Specify NATS password
 -      port: 4222  # Default value
 -      machines: [VAR_NATS_IP]  # Specify your NATS IPs
 -
 -networks:
 -- name: default
 -  type: manual
 -  subnets:
 -  - range: VAR_CF1_NET_RANGE
 -    gateway: VAR_CF1_NET_GW
 -    dns:
 -    - VAR_CF1_DNS_1
 -    - VAR_CF1_DNS_2
 -    reserved:
 -    - 192.168.1.2 - 192.168.1.95
 -    static:
 -    - 192.168.1.96 - 192.168.1.120
 -    cloud_properties:
 -      name: VAR_CF1_NET_NAME
 -
 diff --git cloud.gov/templates/stub.warden.example.yml cloudfoundry-community/templates/stub.warden.example.yml
 deleted file mode 100644
 index 4d039ad..0000000
 --- cloud.gov/templates/stub.warden.example.yml
 +++ /dev/null
 @@ -1,34 +0,0 @@
 ----
 -name: logsearch
 -director_uuid: VAR_UUID # BOSH UUID
 -
 -jobs:
 -- name: elasticsearch_master
 -  instances: 1
 -
 -- name: elasticsearch_data
 -  instances: 2
 -
 -- name: ingestor
 -  instances: 1
 -
 -- name: ingestor-bosh-nats
 -  instances: 1
 -
 -- name: kibana
 -  instances: 1
 -
 -- name: maintenance
 -  instances: 1
 -
 -- name: cluster_monitor
 -  instances: 1
 -
 -properties:
 -  nats_to_syslog:
 -    # Specify the NATS settings of the Bosh Director
 -    nats:
 -      user: VAR_NATS_USER  # Specify NATS user
 -      password: VAR_NATS_PASS  # Specify NATS password
 -      port: 4222  # Default value
 -      machines: [VAR_NATS_IP]  # Specify your NATS IPs