Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

Commit 51485b3

Browse files
author
Johanna Smith
committed
Merge commit 'f745a1155953145d26737a7ec8746a9974b15ba5'
2 parents e28ac45 + f745a11 commit 51485b3

File tree

17 files changed

+62
-56
lines changed

17 files changed

+62
-56
lines changed

.gitmodules

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
[submodule "src/google.golang.org/grpc"]
2323
path = src/google.golang.org/grpc
2424
url = https://github.com/grpc/grpc-go
25-
[submodule "src/github.com/cloudfoundry/loggregator-api"]
26-
path = src/github.com/cloudfoundry/loggregator-api
27-
url = https://github.com/cloudfoundry/loggregator-api
2825
[submodule "src/github.com/crewjam/rfc5424"]
2926
path = src/github.com/crewjam/rfc5424
3027
url = https://github.com/crewjam/rfc5424
@@ -37,3 +34,18 @@
3734
[submodule "src/github.com/cloudfoundry/diodes"]
3835
path = src/github.com/cloudfoundry/diodes
3936
url = https://github.com/cloudfoundry/diodes
37+
[submodule "src/code.cloudfoundry.org/rfc5424"]
38+
path = src/code.cloudfoundry.org/rfc5424
39+
url = https://github.com/cloudfoundry-incubator/rfc5424
40+
[submodule "src/github.com/cloudfoundry/dropsonde"]
41+
path = src/github.com/cloudfoundry/dropsonde
42+
url = https://github.com/cloudfoundry/dropsonde
43+
[submodule "src/github.com/cloudfoundry/sonde-go"]
44+
path = src/github.com/cloudfoundry/sonde-go
45+
url = https://github.com/cloudfoundry/sonde-go
46+
[submodule "src/github.com/gogo/protobuf"]
47+
path = src/github.com/gogo/protobuf
48+
url = https://github.com/gogo/protobuf
49+
[submodule "src/github.com/nu7hatch/gouuid"]
50+
path = src/github.com/nu7hatch/gouuid
51+
url = https://github.com/nu7hatch/gouuid

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Scalable Syslog Release [![slack.cloudfoundry.org][slack-badge]][loggregator-slack]
1+
# Scalable Syslog Release [![slack.cloudfoundry.org][slack-badge]][loggregator-slack] [![CI Badge][ci-badge]][ci-pipeline]
22

33
Scalable syslog is a [Bosh][bosh] release that works in conjunction with
44
[Loggregator][loggregator] to bind applications to syslog readers. It can be
@@ -108,3 +108,5 @@ Assuming you have these two CAs, run the following commands:
108108
[cf-deployment]: https://code.cloudfoundry.org/cf-deployment
109109
[sample-manifest]: https://code.cloudfoundry.org/scalable-syslog-release/blob/master/manifests/scalable-syslog.yml
110110
[common-cloud-config]: https://code.cloudfoundry.org/bosh-deployment/blob/master/warden/cloud-config.yml
111+
[ci-badge]: https://loggregator.ci.cf-app.com/api/v1/pipelines/scalable-syslog/jobs/tests/badge
112+
[ci-pipeline]: https://loggregator.ci.cf-app.com/teams/main/pipelines/scalable-syslog

jobs/scheduler/spec

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ packages:
1515
consumes:
1616
- name: adapter_addrs
1717
type: addr
18+
optional: true
1819

1920
properties:
2021
scalablesyslog.scheduler.require_opt_in:
@@ -29,6 +30,15 @@ properties:
2930
description: "The port for pprof on the scheduler"
3031
default: 0
3132

33+
scalablesyslog.adapter.addrs:
34+
description: |
35+
A collection of adapter addresses. This is used only if the
36+
adapter_adders link is not provided.
37+
default: []
38+
scalablesyslog.adapter.port:
39+
description: "The port used to communicate with the adapters via gRPC."
40+
default: 4443
41+
3242
scalablesyslog.scheduler.tls.client.ca:
3343
description: "The TLS CA for the scalable syslog"
3444
scalablesyslog.scheduler.tls.client.cert:

jobs/scheduler/templates/ctl.erb

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@ ulimit -n 8192
2323
blacklisted_ips = blacklisted_ranges.map do |range|
2424
"#{range['start']}-#{range['end']}"
2525
end.join(",")
26+
adapter_addrs = []
27+
adapter_port = 0
28+
if_link("adapter_addrs") do |l|
29+
adapter_addrs = l.instances.map(&:address).join(",")
30+
adapter_port = l.p('scalablesyslog.adapter.port')
31+
end.else do
32+
adapter_addrs = p('scalablesyslog.adapter.addrs').join(",")
33+
adapter_port = p('scalablesyslog.adapter.port')
34+
end
2635
%>
2736

2837
echo $$ > $PIDFILE
@@ -41,8 +50,8 @@ exec chpst -u vcap:vcap ./scheduler \
4150
--api-cn=<%= p("scalablesyslog.scheduler.tls.api.cn") %> \
4251
--api-skip-cert-verify=<%= p("scalablesyslog.scheduler.tls.api.skip_cert_verify") %> \
4352
--api-polling-interval=<%= p("scalablesyslog.scheduler.api.polling_interval") %> \
44-
--adapter-addrs=<%= link("adapter_addrs").instances.map(&:address).join(",") %> \
45-
--adapter-port=<%= link("adapter_addrs").p('scalablesyslog.adapter.port') %> \
53+
--adapter-addrs=<%= adapter_addrs %> \
54+
--adapter-port=<%= adapter_port %> \
4655
--blacklist-ranges=<%= blacklisted_ips %> \
4756
--metric-ingress-addr=<%= p("scalablesyslog.scheduler.metric.addr") %> \
4857
--metric-ingress-cn=<%= p("scalablesyslog.scheduler.metric.cn") %> \

manifests/scalable-syslog.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ instance_groups:
5555
- name: adapter
5656
azs:
5757
- z1
58+
- z2
5859
instances: 3
5960
persistent_disk_type: 1GB
6061
vm_type: default

packages/adapter/spec

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,7 @@ files:
88
- code.cloudfoundry.org/go-loggregator/*.go # gosub
99
- code.cloudfoundry.org/go-loggregator/pulseemitter/*.go # gosub
1010
- code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub
11-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub
12-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub
13-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub
14-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub
15-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub
16-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub
17-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub
18-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub
19-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub
20-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub
21-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub
22-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub
23-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub
24-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub
25-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub
11+
- code.cloudfoundry.org/rfc5424/*.go # gosub
2612
- code.cloudfoundry.org/scalable-syslog/adapter/*.go # gosub
2713
- code.cloudfoundry.org/scalable-syslog/adapter/app/*.go # gosub
2814
- code.cloudfoundry.org/scalable-syslog/adapter/internal/binding/*.go # gosub
@@ -34,7 +20,6 @@ files:
3420
- code.cloudfoundry.org/scalable-syslog/internal/diodes/*.go # gosub
3521
- code.cloudfoundry.org/scalable-syslog/internal/health/*.go # gosub
3622
- github.com/cloudfoundry/diodes/*.go # gosub
37-
- github.com/crewjam/rfc5424/*.go # gosub
3823
- github.com/golang/protobuf/proto/*.go # gosub
3924
- github.com/golang/protobuf/ptypes/any/*.go # gosub
4025
- golang.org/x/net/context/*.go # gosub

packages/fake_logs_provider/spec

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ files:
88
- code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub
99
- code.cloudfoundry.org/go-loggregator/testhelpers/*.go # gosub
1010
- code.cloudfoundry.org/go-loggregator/testhelpers/fakes/*.go # gosub
11-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub
12-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub
13-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub
14-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub
15-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub
16-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub
17-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub
18-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub
19-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub
20-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub
21-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub
22-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub
23-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub
24-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub
25-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub
2611
- code.cloudfoundry.org/scalable-syslog/tools/fake_logs_provider/*.go # gosub
2712
- github.com/golang/protobuf/proto/*.go # gosub
2813
- github.com/golang/protobuf/ptypes/any/*.go # gosub
@@ -37,3 +22,17 @@ files:
3722
- golang.org/x/text/transform/*.go # gosub
3823
- golang.org/x/text/unicode/bidi/*.go # gosub
3924
- golang.org/x/text/unicode/norm/*.go # gosub
25+
- google.golang.org/genproto/googleapis/rpc/status/*.go # gosub
26+
- google.golang.org/grpc/*.go # gosub
27+
- google.golang.org/grpc/codes/*.go # gosub
28+
- google.golang.org/grpc/credentials/*.go # gosub
29+
- google.golang.org/grpc/grpclog/*.go # gosub
30+
- google.golang.org/grpc/internal/*.go # gosub
31+
- google.golang.org/grpc/keepalive/*.go # gosub
32+
- google.golang.org/grpc/metadata/*.go # gosub
33+
- google.golang.org/grpc/naming/*.go # gosub
34+
- google.golang.org/grpc/peer/*.go # gosub
35+
- google.golang.org/grpc/stats/*.go # gosub
36+
- google.golang.org/grpc/status/*.go # gosub
37+
- google.golang.org/grpc/tap/*.go # gosub
38+
- google.golang.org/grpc/transport/*.go # gosub

packages/scheduler/spec

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ files:
88
- code.cloudfoundry.org/go-loggregator/*.go # gosub
99
- code.cloudfoundry.org/go-loggregator/pulseemitter/*.go # gosub
1010
- code.cloudfoundry.org/go-loggregator/rpc/loggregator_v2/*.go # gosub
11-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/genproto/googleapis/rpc/status/*.go # gosub
12-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/*.go # gosub
13-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/codes/*.go # gosub
14-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/credentials/*.go # gosub
15-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclb/grpc_lb_v1/*.go # gosub
16-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/grpclog/*.go # gosub
17-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/internal/*.go # gosub
18-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/keepalive/*.go # gosub
19-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/metadata/*.go # gosub
20-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/naming/*.go # gosub
21-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/peer/*.go # gosub
22-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/stats/*.go # gosub
23-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/status/*.go # gosub
24-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/tap/*.go # gosub
25-
- code.cloudfoundry.org/go-loggregator/vendor/google.golang.org/grpc/transport/*.go # gosub
2611
- code.cloudfoundry.org/scalable-syslog/internal/api/*.go # gosub
2712
- code.cloudfoundry.org/scalable-syslog/internal/api/v1/*.go # gosub
2813
- code.cloudfoundry.org/scalable-syslog/internal/health/*.go # gosub

src/code.cloudfoundry.org/rfc5424

Submodule rfc5424 added at 769e2ed

0 commit comments

Comments
 (0)