Skip to content
This repository was archived by the owner on Jan 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
bb2c1f5
DEV-39965: Allow the user to specify a parent group during installation
Oct 12, 2018
5735cb4
Merge pull request #1 in DEV/k8s-argus from DEV-39965-allow-the-user-…
Oct 15, 2018
2d53e26
DEV-39965: Allow the user to specify a parent group during installation
Oct 16, 2018
3c03f96
Merge pull request #2 in DEV/k8s-argus from DEV-39965-allow-the-user-…
Oct 16, 2018
5dfab5b
DEV-40505: Sync the k8s resource to santaba when argus launches
Nov 1, 2018
4058f07
DEV-40434: The alert status of Pods and Services are disabled
Nov 2, 2018
e43a6a7
DEV-40505: Sync the k8s resource to santaba when argus launches
Nov 2, 2018
58a9125
Merge pull request #3 in DEV/k8s-argus from DEV-40505-sync-the-k8s-re…
Nov 6, 2018
33c0a67
Merge pull request #4 in DEV/k8s-argus from bugfix/DEV-40434-the-aler…
Nov 6, 2018
b4ce488
DEV-40505: Sync the k8s resource to santaba when argus launches
Nov 9, 2018
a03490e
Merge pull request #6 in DEV/k8s-argus from DEV-40505-sync-the-k8s-re…
Nov 10, 2018
e7c90f1
DEV-40779: Enable the alert on service group when it is created by argus
Nov 14, 2018
d36f943
Merge pull request #7 in DEV/k8s-argus from DEV-40779-enable-the-aler…
Nov 15, 2018
cc8efda
DEV-41432: Use IP as hostname for argus related devices
Dec 11, 2018
eb4fffb
DEV-41432: Use IP as hostname for argus related devices
Dec 13, 2018
16000b5
DEV-41459: Add a new device type for k8s devices
Dec 13, 2018
821500c
Merge pull request #9 in DEV/k8s-argus from DEV-41459-add-a-new-devic…
Dec 14, 2018
d570b4f
Merge pull request #8 in DEV/k8s-argus from DEV-41432-use-ip-as-hostn…
Dec 14, 2018
e6152f8
DEV-41432: Use IP as hostname for argus related devices
Dec 17, 2018
4079f66
Merge pull request #10 in DEV/k8s-argus from DEV-41432-use-ip-as-host…
Dec 17, 2018
f35228a
DEV-40217: Support to set log levels and improve logs in argus relate…
Dec 18, 2018
968a0ad
DEV-40217: Support to set log levels and improve logs in argus relate…
Dec 19, 2018
a6f1cd1
Merge branch 'master' into develop
woz5999 Dec 20, 2018
e56e41e
DEV-41682: Improve the argus code for the CI failure in GitHub
Dec 21, 2018
66f8a96
Merge pull request #1 from JeremyTangCD/DEV-41682-improve-the-argus-c…
JeremyTangCD Dec 21, 2018
5a8c798
Merge pull request #12 in DEV/k8s-argus from DEV-41682-improve-the-ar…
Dec 26, 2018
f634986
Merge pull request #11 in DEV/k8s-argus from DEV-40217-support-to-set…
Dec 26, 2018
2d0e559
Merge pull request #3 from JeremyTangCD/DEV-40217-support-to-set-log-…
JeremyTangCD Jan 2, 2019
b27023b
Merge branch 'develop' into develop
JeremyTangCD Jan 2, 2019
3286dcd
Dev-40217 support to set log levels and improve
JeremyTangCD Jan 2, 2019
06bdd15
DEV-41947: Improve the initsync logic to prevent lost data after k8s …
Jan 9, 2019
c69d432
DEV-41947: Improve the initsync logic to prevent lost data after k8s …
Jan 10, 2019
fc8f4f7
Merge pull request #13 in DEV/k8s-argus from DEV-41947-improve-the-in…
Jan 11, 2019
f1a712e
DEV-42060: Don't create collector device for Kubernetes Clusters
Jan 14, 2019
1d790d0
Merge pull request #14 in DEV/k8s-argus from DEV-42060-don-t-create-c…
Jan 15, 2019
d65374e
DEV-47062 Add distinguishing property to host network pods
Jan 22, 2019
746c3d9
Merge pull request #15 in DEV/k8s-argus from DEV-47062-add-distinguis…
Jan 29, 2019
30932b0
DEV-49046 Fix the internal IP cannot found bug in argus
Feb 14, 2019
838e88b
Merge pull request #16 in DEV/k8s-argus from DEV-49046-fix-the-intern…
Feb 15, 2019
7ecbcf6
Merge pull request #4 from JeremyTangCD/DEV-49046-fix-the-internal-ip…
JeremyTangCD Feb 15, 2019
a0c3b2d
Merge branch 'develop' into develop
JeremyTangCD Feb 15, 2019
2cc8d13
DEV-49046 Fix the internal IP cannot found bug in argus
Feb 18, 2019
93e95d8
Merge pull request #17 in DEV/k8s-argus from DEV-49046-fix-the-intern…
Feb 18, 2019
6293a0a
Merge pull request #5 from JeremyTangCD/DEV-49046-fix-the-internal-ip…
JeremyTangCD Feb 18, 2019
2333cd4
Update node_test.go
JeremyTangCD Feb 18, 2019
ea10463
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
Feb 18, 2019
55d703e
Merge pull request #18 in DEV/k8s-argus from DEV-48974-upgrade-argus-…
Feb 21, 2019
cf2cdf0
Merge pull request #6 from JeremyTangCD/DEV-48974-upgrade-argus-from-…
JeremyTangCD Feb 28, 2019
f9d6759
Merge pull request #7 from logicmonitor/develop
JeremyTangCD Feb 28, 2019
ffacdd6
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
Feb 28, 2019
a77e88b
Merge pull request #8 from JeremyTangCD/DEV-48974-upgrade-argus-from-…
JeremyTangCD Feb 28, 2019
1a1fa4e
Merge pull request #9 from logicmonitor/develop
JeremyTangCD Apr 25, 2019
5e8f826
DEV-49251 improve panic log process
DzXiaoLMCD Apr 26, 2019
e9d8d90
DEV-50734 Support all service type, and add the logs
DzXiaoLMCD Apr 26, 2019
34a4ea2
DEV-41301 Upgrade the go sdk to v2
May 5, 2019
21527a1
DEV-41301 Upgrade the go sdk to v2
May 5, 2019
db5aaed
DEV-41301 Upgrade the go sdk to v2
May 5, 2019
12fd071
DEV-41301 Upgrade the go sdk to v2
May 6, 2019
f0997f0
DEV-50734 Support all service type, modify the UpdateFunc
DzXiaoLMCD May 6, 2019
69f8fb5
DEV-41301 Upgrade the go sdk to v2
May 6, 2019
5f8afc4
DEV-50929 Add k8s deployments monitoring by Argus
DzXiaoLMCD May 7, 2019
d45062a
DEV-49251 Add the defer to initSync and improve log output
DzXiaoLMCD May 7, 2019
fa9fe85
Merge pull request #20 in DEV/k8s-argus from DEV-50734-devts-6790-dis…
DzXiaoLMCD May 7, 2019
23f2cd3
Merge pull request #21 in DEV/k8s-argus from DEV-41301-upgrade-the-go…
May 7, 2019
8e1b0e5
DEV-41301 Upgrade the go sdk to v2
May 7, 2019
3d9407c
Merge pull request #23 in DEV/k8s-argus from DEV-41301-upgrade-the-go…
May 7, 2019
0e9d209
DEV-50929 Improve the code with comments
DzXiaoLMCD May 7, 2019
50e6b2d
Merge pull request #19 in DEV/k8s-argus from DEV-49251-improve-panic-…
DzXiaoLMCD May 8, 2019
3944266
DEV-50929 Add k8s deployments monitoring by Argus
DzXiaoLMCD May 8, 2019
17a50a0
DEV-49675 Merge from develop branch
DzXiaoLMCD May 10, 2019
8f80c6c
DEV-50734 Improve the log message
DzXiaoLMCD May 11, 2019
100a717
DEV-49251 Improve the log message
DzXiaoLMCD May 11, 2019
70702f7
Merge pull request #27 in DEV/k8s-argus from DEV-49251-improve-panic-…
DzXiaoLMCD May 12, 2019
6d1787f
Merge pull request #28 in DEV/k8s-argus from DEV-50734-devts-6790-dis…
DzXiaoLMCD May 12, 2019
58027d7
DEV-49251 Improve the comments
DzXiaoLMCD May 13, 2019
cef2c2f
DEV-49251 Merge improve-panic-log-process branch
DzXiaoLMCD May 13, 2019
5abe682
DEV-51405 Fix the argus log format
DzXiaoLMCD May 13, 2019
1e77de0
DEV-51567 Fixed the label value of k8s monitored
DzXiaoLMCD May 13, 2019
978c9a1
Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-…
DzXiaoLMCD May 14, 2019
57c574e
DEV-49675 Synchronous develop branch, add the recover panic logic for…
DzXiaoLMCD May 14, 2019
2ca8da0
Merge pull request #31 in DEV/k8s-argus from DEV-51405-improve-argus-…
DzXiaoLMCD May 14, 2019
9a4617c
Merge pull request #32 in DEV/k8s-argus from bugfix/DEV-51567-the-lab…
DzXiaoLMCD May 14, 2019
69cc809
Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-…
DzXiaoLMCD May 14, 2019
6e05ef5
Modify the format by Travis CI check
DzXiaoLMCD May 15, 2019
665b218
DEV-51677 Improve the code according to github comments
DzXiaoLMCD May 16, 2019
8c3a4e1
Merge pull request #33 in DEV/k8s-argus from DEV-51677-create-github-…
DzXiaoLMCD May 17, 2019
823f4a1
Improve the variable naming
DzXiaoLMCD May 17, 2019
32730de
DEV-51932 fix uptime widget for k8s resources
DzXiaoLMCD May 30, 2019
dfe477f
Merge pull request #34 in DEV/k8s-argus from DEV-51932-fix-uptime-wid…
DzXiaoLMCD May 31, 2019
c1b5a71
DEV-49675 Merge from develop branch
DzXiaoLMCD Jun 4, 2019
68a9e6f
DEV-49675 Restore the dockerfile
DzXiaoLMCD Jun 4, 2019
f206d06
DEV-52508 Fixed the CI check
DzXiaoLMCD Jun 12, 2019
e313748
DEV-52508 Argus deployment rbac privilege improve
DzXiaoLMCD Jun 12, 2019
87941be
DEV-52508 Argus deployment rbac privilege improve
DzXiaoLMCD Jun 12, 2019
7fee441
DEV-51952 Research argus http & http proxy configuration options
DzXiaoLMCD Jun 12, 2019
302f10c
DEV-51952 Research argus http & http proxy configuration options
DzXiaoLMCD Jun 13, 2019
d5f9ae0
DEV-52508 Argus deployment rbac privilege compatibility improvement
DzXiaoLMCD Jun 14, 2019
af73614
DEV-52508 Argus deployment rbac privilege compatibility improvement
DzXiaoLMCD Jun 14, 2019
7b00015
DEV-52508 Argus deployment rbac privilege compatibility improvement
DzXiaoLMCD Jun 14, 2019
0551743
DEV-52036 Allow for duplicate pod names in one LM account
DzXiaoLMCD Jun 16, 2019
d139bb7
DEV-52508 Improve by the comments
DzXiaoLMCD Jun 16, 2019
b516b2d
DEV-52036 Allow for duplicate pod names in one LM account
DzXiaoLMCD Jun 16, 2019
2686988
DEV-52508 Fix the comments
DzXiaoLMCD Jun 17, 2019
a1df27e
DEV-52508 Fix the comments
DzXiaoLMCD Jun 17, 2019
421d532
Merge pull request #35 in DEV/k8s-argus from feature/DEV-52508-argus-…
DzXiaoLMCD Jun 17, 2019
d64d3d8
DEV-52044 Add http proxy for argus
DzXiaoLMCD Jun 18, 2019
538e9b3
Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus i…
DzXiaoLMCD Jun 19, 2019
ef024be
remove logo link
DzXiaoLMCD Jun 19, 2019
3aada1f
DEV-52044 Add http proxy for argus
DzXiaoLMCD Jun 19, 2019
c828030
Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-…
DzXiaoLMCD Jun 19, 2019
a0d2ab0
DEV-52036 Allow for duplicate pod names in one LM account
DzXiaoLMCD Jun 20, 2019
9fe97da
DEV-52036 Allow for duplicate pod names in one LM account
DzXiaoLMCD Jun 20, 2019
203f978
DEV-52036 Allow for duplicate pod names in one LM account
DzXiaoLMCD Jun 20, 2019
2d1cd4b
DEV-52044 Add httpURL parameter description
DzXiaoLMCD Jun 20, 2019
6921bc3
Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus i…
DzXiaoLMCD Jun 20, 2019
99542e7
Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-…
DzXiaoLMCD Jun 21, 2019
569edd3
DEV-52044 Add httpURL parameter description
DzXiaoLMCD Jun 21, 2019
4534a64
DEV-52044 Fix the comments
DzXiaoLMCD Jun 21, 2019
361a378
DEV-52044 Fix the comments
DzXiaoLMCD Jun 21, 2019
1829b56
DEV-52036 Fix the comments
DzXiaoLMCD Jun 21, 2019
f82a0bf
DEV-52044 Improve the http proxy configuration
DzXiaoLMCD Jun 21, 2019
298b037
DEV-52044 Improve the http proxy configuration
DzXiaoLMCD Jun 21, 2019
41a2dc0
DEV-52036 Fix the comments
DzXiaoLMCD Jun 21, 2019
e294264
Merge branch 'DEV-52036-allow-for-duplicate-pod-names-in' of https://…
DzXiaoLMCD Jul 2, 2019
a5e616a
Merge branch 'develop' of https://github.com/DzXiaoLMCD/k8s-argus int…
DzXiaoLMCD Jul 2, 2019
72f2ee8
DEV-52991 Add UT
DzXiaoLMCD Jul 3, 2019
c7c0e2d
Merge pull request #39 in DEV/k8s-argus from DEV-52991-create-pr-for-…
DzXiaoLMCD Jul 4, 2019
8561f9d
DEV-52692 fix the comments
DzXiaoLMCD Jul 18, 2019
05ebe17
DEV-52692 fix the comments
DzXiaoLMCD Jul 18, 2019
488da04
Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-…
DzXiaoLMCD Jul 19, 2019
9d5d89e
DEV-52692 Support proxy for dockerized collector
DzXiaoLMCD Jul 19, 2019
b049bd0
Merge pull request #40 in DEV/k8s-argus from DEV-52692-support-proxy-…
DzXiaoLMCD Jul 24, 2019
ad09dcd
Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus i…
DzXiaoLMCD Jul 29, 2019
0806e09
DEV-53516 Create PR for supporting http proxy configuration
DzXiaoLMCD Jul 29, 2019
bacb005
Merge branch 'develop' of https://github.com/DzXiaoLMCD/k8s-argus int…
DzXiaoLMCD Jul 29, 2019
9885f23
Merge pull request #41 in DEV/k8s-argus from DEV-53516-create-pr-for-…
DzXiaoLMCD Jul 30, 2019
ab0f882
DEV-55114 Argus shouldn't overwrite system.categories values
Nov 11, 2019
c4a5efa
DEV-55114 Argus shouldn't overwrite system.categories values
Nov 11, 2019
1a9d37e
DEV-55114 Argus shouldn't overwrite system.categories values
Nov 11, 2019
edd79ad
DEV-55114 Argus shouldn't overwrite system.categories values
Nov 11, 2019
6425fd6
DEV-55114 Argus shouldn't overwrite system.categories values
Nov 12, 2019
2b299cf
Merge pull request #42 in DEV/k8s-argus from DEV-55114-argus-shouldn-…
Nov 14, 2019
b628107
feature/upgrade: updated k8s sdk to 1.17 and client-go library to 14.0.
lmvaibhavk Mar 6, 2020
753ff7a
DEV-58267: updated v1betv2 client to v1 for deployment watcher.
lmvaibhavk Apr 3, 2020
47b4945
Merge pull request #43 in DEV/k8s-argus from DEV-58267-change-deploym…
lmvaibhavk Apr 6, 2020
89a0cbd
Updated Golang sdk version to 1.14.1
prathameshmahajan28 Apr 6, 2020
c1c9119
Merge pull request #44 in DEV/k8s-argus from DEV-55196-update-k8s-sdk…
prathameshmahajan28 Apr 6, 2020
8bb8955
Merge pull request #45 in DEV/k8s-argus from feature/upgrade to develop
lmvaibhavk Apr 14, 2020
6ac5c08
Squashed commit of the following:
lmvaibhavk Apr 16, 2020
622a387
DEV-58755: Updated image tag to new series i.e. v2latest
lmvaibhavk Apr 17, 2020
3665b6b
Merge pull request #46 in DEV/k8s-argus from DEV-58756-update-argus-i…
lmvaibhavk Apr 17, 2020
c3f33b3
Squashed commit of the following:
lmvaibhavk Apr 17, 2020
520e47b
Merge remote-tracking branch 'bitbucket/develop' into stash-to-git
lmvaibhavk Apr 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ language: generic

install:
- mkdir -p $HOME/goroot
- curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar -xz --strip-components=1 -C $HOME/goroot
- curl -L https://storage.googleapis.com/golang/go1.14.1.linux-amd64.tar.gz | tar -xz --strip-components=1 -C $HOME/goroot
- export GOROOT=$HOME/goroot
- export GOPATH=$HOME/gopath
- export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM golang:1.11 as build
FROM golang:1.14 as build
WORKDIR $GOPATH/src/github.com/logicmonitor/k8s-argus
ARG VERSION
COPY ./ ./
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /argus -ldflags "-X \"github.com/logicmonitor/k8s-argus/pkg/constants.Version=${VERSION}\""

FROM golang:1.11 as test
FROM golang:1.14 as test
WORKDIR $GOPATH/src/github.com/logicmonitor/k8s-argus
RUN go get -u github.com/alecthomas/gometalinter
RUN gometalinter --install
Expand Down
Loading