Skip to content

Commit 6f6e955

Browse files
nmillalafnmillalaf
committed
Merge branch 'hotfix/github'
2 parents 043c7f2 + e1fb7fd commit 6f6e955

17 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎Godeps/Godeps.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,30 @@ If everything goes right, you should see in your terminal the _Nozzle's Logs_ an
5252

5353
### Filtering Option
5454

55-
asked. It works this way:
56-
* case 1:
57-
Include-Only filter="" (Empty)
58-
Exclude-Always filter="" (Empty)
59-
in this case, all the events will be sent to Sumo Logic
60-
61-
* case 2:
62-
Include-Only filter="" (Empty)
63-
Exclude-Always filter= "source_type:other,origin:rep",
64-
in this case, all the events that contains a source-type:other field OR an origin:rep field will be not sent to Sumo Logic
65-
66-
* case 3:
67-
Include-Only filter="job:diego_cell,source_type:other"
68-
Exclude-Always filter="" (Empty)
69-
in this case, Only the events that contains a job:diego-cell field OR a source-type:other field will be sent to Sumo Logic
70-
71-
* case 4:
72-
Include-Only filter="job:diego_cell,source_type:other"
73-
Exclude-Always filter="source_type:other,origin:rep"
74-
75-
in this case, all the events that contains a job:diego-cell field OR a source-type:other field will be sent to Sumo Logic
76-
AND also
77-
all the events that contains a source-type:other field OR an origin:rep field will be not sent to Sumo Logic
78-
if an event share both filters (contains a Include-Only filter field and a Exclude-Always filter field), Only the *Include-Only filter will be considered*
55+
It works this way:
56+
* **Case 1**:
57+
**Include-Only filter**="" (_Empty_)
58+
**Exclude-Always filter**="" (_Empty_)
59+
In this case, _**all**_ the events will be sent to Sumo Logic
60+
61+
* **Case 2**:
62+
**Include-Only filter**="" (Empty)
63+
**Exclude-Always filter**= source_type:other,origin:rep
64+
in this case, all the events that contains a _**source-type:other**_ field OR an _**origin:rep**_ field will be not sent to Sumo Logic
65+
66+
* **Case 3**:
67+
**Include-Only filter**=job:diego_cell,source_type:other
68+
**Exclude-Always filter**="" (Empty)
69+
in this case, Only the events that contains a _**job:diego-cell**_ field OR a _**source-type:other**_ field will be sent to Sumo Logic
70+
71+
* **Case 4**:
72+
**Include-Only filter**=job:diego_cell,source_type:other
73+
**Exclude-Always filter**=source_type:other,origin:rep
74+
In this case, all the events that contains a _**job:diego-cell**_ field OR a _**source-type:other**_ field will be sent to Sumo Logic
75+
**AND also**
76+
All the events that contains a _**source-type:other**_ field OR an _**origin:rep**_ field will be not sent to Sumo Logic
77+
78+
If an event **share both filters** (contains a _Include-Only filter_ field and a _Exclude-Always_ filter field), Only the _**Include-Only**_ filter will be considered.
7979

8080
The correct way of using those flags will be something like this:
8181

‎caching/cachingfakes/fake_caching.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sync"
66
"time"
77

8-
"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/caching"
8+
"github.com/mcplusa/cloudfoundry-sumologic-nozzle/caching"
99
)
1010

1111
type FakeCaching struct {

‎ci/build-all/build-all‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export ROOT_DIR=$PWD
44
export GOPATH=$PWD/gopath
55
export PATH=$GOPATH/bin:$PATH
66
export BUILD_NUMBER=`[ ${VERSION_APP} ] && cat ${VERSION_APP} || echo "0.0.0"`
7-
cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic
7+
cd $GOPATH/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle
88

99
make clean
1010
make compile

‎ci/build-all/build-all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ image_resource:
99

1010
inputs:
1111
- name: firehose-to-sumologic-ci
12-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/
12+
path: gopath/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/
1313
- name: version
1414

1515
outputs:
1616
- name: firehose-to-sumologic-ci-build
1717

1818
run:
19-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/ci/build-all/build-all
19+
path: gopath/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/ci/build-all/build-all
2020
params:
2121
VERSION_APP:

‎ci/unit-testing/unit-testing‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export PATH=$GOPATH/bin:$PATH
88
go get github.com/onsi/ginkgo/ginkgo
99
go get github.com/onsi/gomega
1010

11-
cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/
11+
cd $GOPATH/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/
1212

1313

1414
make test

‎ci/unit-testing/unit-testing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image_resource:
88

99
inputs:
1010
- name: firehouse-to-sumologic-ci
11-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/
11+
path: gopath/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/
1212

1313
run:
14-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/ci/unit-testing/unit-testing
14+
path: gopath/src/github.com/mcplusa/cloudfoundry-sumologic-nozzle/ci/unit-testing/unit-testing

‎eventQueue/eventQueue.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package eventQueue
22

3-
import . "bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/events"
3+
import . "github.com/mcplusa/cloudfoundry-sumologic-nozzle/events"
44

55
// Queue is a basic FIFO queue based on a circular list that resizes as needed.
66
type Queue struct {

‎eventQueue/eventQueue_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package eventQueue
33
import (
44
"testing"
55

6-
. "bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/events"
6+
. "github.com/mcplusa/cloudfoundry-sumologic-nozzle/events"
77
"github.com/stretchr/testify/assert"
88
)
99

‎eventRouting/eventrouting.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"strings"
77
"sync"
88

9-
"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/caching"
10-
"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/eventQueue"
11-
fevents "bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/events"
9+
"github.com/mcplusa/cloudfoundry-sumologic-nozzle/caching"
10+
"github.com/mcplusa/cloudfoundry-sumologic-nozzle/eventQueue"
11+
fevents "github.com/mcplusa/cloudfoundry-sumologic-nozzle/events"
1212
"github.com/cloudfoundry/sonde-go/events"
1313
)
1414

0 commit comments

Comments
 (0)