Skip to content

Commit aa69a2f

Browse files
authored
Update hec telemetry (#275)
* update app version and ci config
1 parent dc574e2 commit aa69a2f

File tree

4 files changed

+28
-27
lines changed

4 files changed

+28
-27
lines changed

.circleci/config.yml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
- run:
1010
name: Install Dependencies
1111
command: |
12-
curl https://glide.sh/get | sh
13-
go get -t ./...
12+
go get -u -v -t github.com/Masterminds/glide
13+
glide install --strip-vendor
1414
- run:
1515
name: Builder
1616
command: make build
@@ -20,7 +20,7 @@ jobs:
2020
make testall
2121
cp splunk-firehose-nozzle /tmp
2222
- persist_to_workspace:
23-
root: /tmp
23+
root: /tmp
2424
paths:
2525
- splunk-firehose-nozzle
2626

@@ -35,8 +35,8 @@ jobs:
3535
- run:
3636
name: Install dependencies
3737
command: |
38-
curl https://glide.sh/get | sh
39-
go get -t ./...
38+
go get -u -v -t github.com/Masterminds/glide
39+
glide install --strip-vendor
4040
cp -R /tmp/splunk-firehose-nozzle .
4141
- run:
4242
name: Deploy nozzle
@@ -75,8 +75,8 @@ jobs:
7575
- run:
7676
name: Install dependencies
7777
command: |
78-
curl https://glide.sh/get | sh
79-
go get -t ./...
78+
go get -u -v -t github.com/Masterminds/glide
79+
glide install --strip-vendor
8080
cp -R /tmp/splunk-firehose-nozzle .
8181
- run:
8282
name: Deploy data-gen
@@ -112,20 +112,21 @@ workflows:
112112
build-and-deploy-nozzle:
113113
jobs:
114114
- build
115-
# - deploy-nozzle:
116-
# requires:
117-
# - build
118-
# # - tile-builder:
119-
# # requires:
120-
# # - deploy-nozzle
121-
# # filters:
122-
# # branches:
123-
# # only: master
124-
# - execute_tests:
125-
# requires:
126-
# - deploy-nozzle
127-
# filters:
128-
# branches:
129-
# only:
130-
# - master
131-
# - release/v1.2.0
115+
- deploy-nozzle:
116+
requires:
117+
- build
118+
# - tile-builder:
119+
# requires:
120+
# - deploy-nozzle
121+
# filters:
122+
# branches:
123+
# only: master
124+
- execute_tests:
125+
requires:
126+
- deploy-nozzle
127+
filters:
128+
branches:
129+
only:
130+
- develop
131+
- master
132+
# - release/v1.2.0

.circleci/pre-req.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ make
66
wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
77
echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
88
#Add support for https apt sources
9-
sudo apt-get install apt-transport-https ca-certificates
109
sudo apt-get update
10+
sudo apt-get install apt-transport-https ca-certificates
1111
sudo apt-get install cf-cli
1212
#CF Login
1313
cf login --skip-ssl-validation -a $API_ENDPOINT -u $API_USER -p $API_PASSWORD -o system -s system

eventwriter/splunk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (s *splunkClient) send(postBody *[]byte) error {
8787
//Add app headers for HEC telemetry
8888
//Todo: update static values with appName and appVersion variables
8989
req.Header.Set("__splunk_app_name", "Splunk Firehose Nozzle")
90-
req.Header.Set("__splunk_app_version", "1.2.0")
90+
req.Header.Set("__splunk_app_version", "1.2.2")
9191

9292
resp, err := s.httpClient.Do(req)
9393
if err != nil {

eventwriter/splunk_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ var _ = Describe("Splunk", func() {
104104
})
105105

106106
It("sets app appVersion", func() {
107-
appVersion := "1.2.0"
107+
appVersion := "1.2.2"
108108

109109
client := NewSplunk(config)
110110
events := []map[string]interface{}{}

0 commit comments

Comments
 (0)