Permalink
Browse files

Bump src/loggregator

Bump :
  John Tuley:
     [#65121514] Remove unnecessary test file
  Alex Jackson:
     bump loggregator lib to pick up new emitter code
     use etcd as a distributed cache for syslog drain information
     dont set TTL for app in etcd... rely on dump sink timeout for removal
     use copy of localhost certs as encoded []byte constants rather than generating files
     refactor sink_manager to use blacklist
     move tests to httptest #test-stability
     mark flaky test as pending
     use new test logger from loggregatorlib to not use real files when testing logging
     move message router to new pattern for input chans
     better manage sinks by auto matically unregistering them with Run() returns
     import new sinkmanager package
     remove empty function
     remove unused interface
     move sinkamanger to its own package
     more deterministic tests for syslog sink #test-stability
     remove usused test file
     move websocket server to its own package
     use more un-relialable hostname in DNS failure test #test-stability
     bail on tests early when failed
     refactored sinks
     test tests with ginkgo
     fix CI
     wip
  Matthew McNew:
     Update SyslogWriter Test to use HTTPtest
     Add Ginkgo to travis path
     updated ginkgo setup
     Kick Travis Build
     fixup merge conflict badness
     Merge branch 'wip_loggregator_stages'
     green tests with refactor
     Major refactoring, stability fixes
  Jared Carroll:
     Add assertion to flaky spec
  Dakota Bailey:
     Increase KeepAlive timeout to fix tests on slow Travis box
  • Loading branch information...
1 parent 182c31e commit fc885d911261b6082341982f0e510ca5576897ea Alex Jackson committed with Aram Price Feb 20, 2014
View
@@ -39,6 +39,8 @@ properties:
description: "This property is not used by the job itself, but has the desired effect of restarting the loggregator jobs when the property changes on bosh deployment. See loggregator_trafficcontroller job spec for a description."
loggregator_endpoint.shared_secret:
description: "Shared secret used to verify cryptographically signed loggregator messages"
+ etcd_ips:
+ description: "IPs pointing to the ETCD cluster"
nats.user:
description: "Username for cc client to connect to NATS"
nats.password:
@@ -1,5 +1,7 @@
<% require 'json' %>
{
+ "EtcdUrls": [<%= p("etcd_ips").map{|addr| "\"http://#{addr}:4001\""}.join(",")%>],
+ "EtcdMaxConcurrentRequests" : 10,
"IncomingPort": <%= p("loggregator.incoming_port") %>,
"OutgoingPort": <%= p("loggregator.outgoing_port") %>,
"SkipCertVerify": <%= p("ssl.skip_cert_verify") %>,
Submodule loggregator updated 476 files
@@ -9,10 +9,6 @@ meta:
name: bosh-warden-boshlite-ubuntu
version: latest
- loggregator_endpoint:
- z2:
- host: "unused"
-
update:
canaries: 1
max_in_flight: 50
@@ -218,13 +214,13 @@ jobs:
instances: 0
networks:
- name: cf1
- static_ips: []
+ static_ips: (( static_ips(10) ))
- name: etcd_z2
instances: 0
networks:
- name: cf2
- static_ips: []
+ static_ips: (( static_ips(9) ))
# only need one router, and set up static IPs
- name: router_z1
View
@@ -342,6 +342,7 @@ jobs:
- name: cf1
static_ips: (( merge ))
properties:
+ etcd_ips: (( jobs.etcd_leader_z1.networks.cf1.static_ips jobs.etcd_z1.networks.cf1.static_ips jobs.etcd_z2.networks.cf2.static_ips ))
networks: (( meta.networks.z1 ))
- name: loggregator_z2
@@ -353,6 +354,7 @@ jobs:
- name: cf2
static_ips: (( merge ))
properties:
+ etcd_ips: (( jobs.etcd_leader_z1.networks.cf1.static_ips jobs.etcd_z1.networks.cf1.static_ips jobs.etcd_z2.networks.cf2.static_ips ))
networks: (( meta.networks.z2 ))
- name: loggregator_trafficcontroller_z1

0 comments on commit fc885d9

Please sign in to comment.