Skip to content
This repository has been archived by the owner on Jan 16, 2023. It is now read-only.

Commit

Permalink
Develop (#175)
Browse files Browse the repository at this point in the history 
* Adding support for k8s 1.167+ (#124)

* DEV-39965: Allow the user to specify a parent group during installation

* DEV-39965: Allow the user to specify a parent group during installation

* DEV-40505: Sync the k8s resource to santaba when argus launches

* DEV-40434: The alert status of Pods and Services are disabled

* DEV-40505: Sync the k8s resource to santaba when argus launches

* DEV-40505: Sync the k8s resource to santaba when argus launches

* DEV-40779: Enable the alert on service group when it is created by argus

* DEV-41432: Use IP as hostname for argus related devices

* DEV-41432: Use IP as hostname for argus related devices

* DEV-41459: Add a new device type for k8s devices

* DEV-41432: Use IP as hostname for argus related devices

* DEV-40217: Support to set log levels and improve logs in argus related projects

* DEV-40217: Support to set log levels and improve logs in argus related projects

* DEV-41682: Improve the argus code for the CI failure in GitHub

* Dev-40217 support to set log levels and improve

Dev-40217 support to set log levels and improve

* DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated

* DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated

* DEV-42060: Don't create collector device for Kubernetes Clusters

* DEV-47062 Add distinguishing property to host network pods

* DEV-49046 Fix the internal IP cannot found bug in argus

* DEV-49046 Fix the internal IP cannot found bug in argus

* Update node_test.go

* DEV-48974 Upgrade Argus from golang 1.9 to 1.11

* DEV-48974 Upgrade Argus from golang 1.9 to 1.11

* DEV-49251 improve panic log process

* DEV-50734 Support all service type, and add the logs

* DEV-41301 Upgrade the go sdk to v2

* DEV-41301 Upgrade the go sdk to v2

* DEV-41301 Upgrade the go sdk to v2

* DEV-41301 Upgrade the go sdk to v2

* DEV-50734 Support all service type, modify the UpdateFunc

* DEV-41301 Upgrade the go sdk to v2

* DEV-50929 Add k8s deployments monitoring by Argus

* DEV-49251 Add the defer to initSync and improve log output

* DEV-41301 Upgrade the go sdk to v2

* DEV-50929 Improve the code with comments

* DEV-50734 Improve the log message

* DEV-49251 Improve the log message

* DEV-49251 Improve the comments

* DEV-51405 Fix the argus log format

* DEV-51567 Fixed the label value of k8s monitored

* DEV-49675 Synchronous develop branch, add the recover panic logic for deployments

* Modify the format by Travis CI check

* DEV-51677 Improve the code according to github comments

* Improve the variable naming

* DEV-51932 fix uptime widget for k8s resources

* DEV-49675 Restore the dockerfile

* DEV-52508 Fixed the CI check

* DEV-52508 Argus deployment rbac privilege improve

* DEV-52508 Argus deployment rbac privilege improve

* DEV-51952 Research argus http & http proxy configuration options

* DEV-51952 Research argus http & http proxy configuration options

* DEV-52508 Argus deployment rbac privilege compatibility improvement

* DEV-52508 Argus deployment rbac privilege compatibility improvement

* DEV-52508 Argus deployment rbac privilege compatibility improvement

* DEV-52036 Allow for duplicate pod names in one LM account

* DEV-52508 Improve by the comments

* DEV-52508 Fix the comments

* DEV-52508 Fix the comments

* DEV-52044 Add http proxy for argus

* remove logo link

* DEV-52044 Add http proxy for argus

* DEV-52036 Allow for duplicate pod names in one LM account

* DEV-52036 Allow for duplicate pod names in one LM account

* DEV-52036 Allow for duplicate pod names in one LM account

* DEV-52044 Add httpURL parameter description

* DEV-52044 Add httpURL parameter description

* DEV-52044 Fix the comments

* DEV-52044 Fix the comments

* DEV-52036 Fix the comments

* DEV-52044 Improve the http proxy configuration

* DEV-52044 Improve the http proxy configuration

* DEV-52036 Fix the comments

* DEV-52991 Add UT

* DEV-52692 fix the comments

* DEV-52692 fix the comments

* DEV-52692 Support proxy for dockerized collector

* DEV-53516 Create PR for supporting http proxy configuration

* DEV-55114 Argus shouldn't overwrite system.categories values

* DEV-55114 Argus shouldn't overwrite system.categories values

* DEV-55114 Argus shouldn't overwrite system.categories values

* DEV-55114 Argus shouldn't overwrite system.categories values

* DEV-55114 Argus shouldn't overwrite system.categories values

* feature/upgrade:  updated k8s sdk to 1.17 and client-go library to 14.0.
and gosdk to 1.14
updated respective vendor packages accordingly

* DEV-58267:  updated v1betv2 client to v1 for deployment watcher.

* Updated Golang sdk version to 1.14.1

* Squashed commit of the following:

commit 8bb8955788741f75678aae30a88cce1f7d22ee62
Merge: 2b299cf9 c1c91193
Author: Vaibhav Kumbhar <[email protected]>
Date:   Tue Apr 14 03:17:10 2020 -0700

    Merge pull request #45 in DEV/k8s-argus from feature/upgrade to develop

    * commit 'c1c91193139aa8a21599a3137644623cdae3c05a':
      Updated Golang sdk version to 1.14.1
      DEV-58267:  updated v1betv2 client to v1 for deployment watcher.
      feature/upgrade:  updated k8s sdk to 1.17 and client-go library to 14.0. and gosdk to 1.14 updated respective vendor packages accordingly

commit c1c91193139aa8a21599a3137644623cdae3c05a
Merge: 47b4945d 89a0cbdf
Author: Prathamesh Mahajan <[email protected]>
Date:   Mon Apr 6 00:02:44 2020 -0700

    Merge pull request #44 in DEV/k8s-argus from DEV-55196-update-k8s-sdk-1.17-client-go-14.0-lib-and-golang-image-1.14-for-argus to feature/upgrade

    * commit '89a0cbdfa5f452e932c5c028056dec0b88cf528a':
      Updated Golang sdk version to 1.14.1

commit 89a0cbdfa5f452e932c5c028056dec0b88cf528a
Author: [email protected] <[email protected]>
Date:   Mon Apr 6 11:17:37 2020 +0530

    Updated Golang sdk version to 1.14.1

commit 47b4945d9a035e9b8d3a22a0559a005dd3e0d135
Merge: b628107a 753ff7ac
Author: Vaibhav Kumbhar <[email protected]>
Date:   Sun Apr 5 22:01:52 2020 -0700

    Merge pull request #43 in DEV/k8s-argus from DEV-58267-change-deployment-client-to-apps-v1-apps-v1betv2-is-no-more-could-not-list-deployments to feature/upgrade

    * commit '753ff7ac22ea8517204025937da6f7acc494f207':
      DEV-58267:  updated v1betv2 client to v1 for deployment watcher.

commit 753ff7ac22ea8517204025937da6f7acc494f207
Author: vaibhav.kumbhar <[email protected]>
Date:   Fri Apr 3 12:30:08 2020 +0530

    DEV-58267:  updated v1betv2 client to v1 for deployment watcher.

commit b628107a999979bc59150cf6c8a506ba67d3489a
Author: vaibhav.kumbhar <[email protected]>
Date:   Fri Mar 6 17:29:49 2020 +0530

    feature/upgrade:  updated k8s sdk to 1.17 and client-go library to 14.0.
    and gosdk to 1.14
    updated respective vendor packages accordingly

commit 2b299cf9e48e4d130a2c8fc8c6d7efceddbc4092
Merge: 9885f238 6425fd62
Author: Jeremy Tang <[email protected]>
Date:   Wed Nov 13 18:07:04 2019 -0800

    Merge pull request #42 in DEV/k8s-argus from DEV-55114-argus-shouldn-t-overwrite-system.categories-values to develop

    * commit '6425fd625a11efc821b3efe4e579ae991f212915':
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values

commit 6425fd625a11efc821b3efe4e579ae991f212915
Author: JeremyCD <[email protected]>
Date:   Tue Nov 12 14:08:30 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit edd79ad45353cd337a2d5de480e9aee9e1d86353
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 17:50:34 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit 1a9d37ef2a86991cee9093fdc121aeb0858d4f59
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 17:37:21 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit c4a5efaf347a0a213f7dc81722b91295d0caf712
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 16:05:34 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit ab0f882b8f6d6dd6e5a084d5ba8cf9ef6dc51335
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 15:42:06 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit 9885f2383d9e71bc8c8d4dc3d594ce13e76d625b
Merge: b049bd02 bacb005d
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jul 29 19:27:55 2019 -0700

    Merge pull request #41 in DEV/k8s-argus from DEV-53516-create-pr-for-supporting-http-proxy to develop

    * commit 'bacb005de10033300a34ac6ff4eb1d431eb724ec':
      DEV-53516 Create PR for supporting http proxy configuration
      Develop (#112)
      Develop (#111)
      Develop (#109)

commit bacb005de10033300a34ac6ff4eb1d431eb724ec
Merge: 0806e097 ad09dcdf
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 15:31:01 2019 +0800

    Merge branch 'develop' of https://github.com/DzXiaoLMCD/k8s-argus into DEV-53516-create-pr-for-supporting-http-proxy

commit 0806e097a53e376ae8fb8e772ae5a6480e541c07
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 15:27:17 2019 +0800

    DEV-53516 Create PR for supporting http proxy configuration

commit ad09dcdf69cbf9f9639ea2e48b51b88becc02c73
Merge: b049bd02 8db30a43
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 15:20:21 2019 +0800

    Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus into dz_github_develop

commit b049bd022903c2a93e008b6a116ecdb91c436d29
Merge: c7c0e2d9 9d5d89e1
Author: Daizhong Xiao <[email protected]>
Date:   Tue Jul 23 17:57:38 2019 -0700

    Merge pull request #40 in DEV/k8s-argus from DEV-52692-support-proxy-for-dockerized-collector to develop

    * commit '9d5d89e18eafedf8d4c01d02b36b7d8545e5cabb':
      DEV-52692 Support proxy for dockerized collector
      DEV-52692 fix the comments
      DEV-52692 fix the comments
      DEV-52044 Improve the http proxy configuration
      DEV-52044 Improve the http proxy configuration
      DEV-52044 Fix the comments
      DEV-52044 Fix the comments
      DEV-52044 Add httpURL parameter description
      DEV-52044 Add httpURL parameter description
      DEV-52044 Add http proxy for argus
      DEV-52044 Add http proxy for argus
      DEV-51952 Research argus http & http proxy configuration options
      DEV-51952 Research argus http & http proxy configuration options

commit 9d5d89e18eafedf8d4c01d02b36b7d8545e5cabb
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 16:02:52 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit 488da04a40be217d03148d60b8bb09387300d9a5
Merge: 05ebe17b c7c0e2d9
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 14:09:02 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into DEV-52692-support-proxy-for-dockerized-collector

commit 05ebe17b9591ba2a82c02aef0b1c66a840803e4b
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 18:08:24 2019 +0800

    DEV-52692 fix the comments

commit 8561f9d455961cf8163b0226119d1ea1a8cfb488
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 18:05:47 2019 +0800

    DEV-52692 fix the comments

commit c7c0e2d9a1f710759cefa6472f08780ae9a12221
Merge: 6921bc31 72f2ee82
Author: Daizhong Xiao <[email protected]>
Date:   Wed Jul 3 19:34:28 2019 -0700

    Merge pull request #39 in DEV/k8s-argus from DEV-52991-create-pr-for-duplicate-pod-names to develop

    * commit '72f2ee826bf9563bb3e9c6a718a490a6defa78d2':
      DEV-52991 Add UT
      DEV-52036 Fix the comments
      DEV-52036 Fix the comments
      DEV-52036 Allow for duplicate pod names in one LM account
      DEV-52036 Allow for duplicate pod names in one LM account
      DEV-52036 Allow for duplicate pod names in one LM account
      remove logo link
      DEV-52036 Allow for duplicate pod names in one LM account

commit 72f2ee826bf9563bb3e9c6a718a490a6defa78d2
Author: dzxiao <[email protected]>
Date:   Wed Jul 3 14:14:07 2019 +0800

    DEV-52991 Add UT

commit a5e616a081a24d6a5f4d200fbdf9f50618f8c174
Merge: e2942642 ef024be7
Author: dzxiao <[email protected]>
Date:   Tue Jul 2 15:35:03 2019 +0800

    Merge branch 'develop' of https://github.com/DzXiaoLMCD/k8s-argus into DEV-52991-create-pr-for-duplicate-pod-names

commit e294264215a78b6caa13c47c9d6d8299ac098f6a
Merge: 6921bc31 41a2dc00
Author: dzxiao <[email protected]>
Date:   Tue Jul 2 09:42:48 2019 +0800

    Merge branch 'DEV-52036-allow-for-duplicate-pod-names-in' of https://stash.logicmonitor.com/scm/dev/k8s-argus into DEV-52991-create-pr-for-duplicate-pod-names

commit 41a2dc000e81cb412a50c56c1eaff868a9107c7f
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 04:38:28 2019 +0800

    DEV-52036 Fix the comments

commit 298b037a1c6b48ff82de52b3756e0131833a95b8
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 03:48:18 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit f82a0bf914fcaabac954f0fe5d9d056690273f03
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 01:48:40 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 1829b56d403fe32c5d579b82891cb1a7932e9315
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 19:04:51 2019 +0800

    DEV-52036 Fix the comments

commit 361a3789ca469c34253bd1f8d889f989ad32b81e
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:52:31 2019 +0800

    DEV-52044 Fix the comments

commit 4534a641f0682396cf91ca12f46f9ada3e23ccb0
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:17:49 2019 +0800

    DEV-52044 Fix the comments

commit 569edd31c64d82e92c9beff3a789ee2a3d5bd7e1
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 08:51:07 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 99542e70a03c5e56080ea57d2d05641f1cd0c597
Merge: 2d1cd4bb 6921bc31
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 08:48:16 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into feature/DEV-52044-add-http-http-proxy-configuration

commit 6921bc31b2edbea9f37da3c99596654426f6ca80
Merge: 421d5322 34b0bf18
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 19:03:27 2019 +0800

    Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus into develop

    # Conflicts:
    #	pkg/sync/initsyncer.go

commit 2d1cd4bbf1ca7080bc23139a83cda4a9596f33d5
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 18:31:02 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 203f978a06c79398633da7bd5411ea932d0e9c32
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 17:54:07 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit 9fe97da53de0d1e8096b2a8678de84fc16b03c0a
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 16:11:02 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit a0d2ab0cfef9707253996f3ac377f88261bb52af
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 16:04:29 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit c82803014cf482b45ab2c741d7977d40a9b94d52
Merge: b516b2d9 421d5322
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 01:35:52 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into DEV-52036-allow-for-duplicate-pod-names-in

commit 3aada1f6de258296443a79d5a45b7c55bee44fcf
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 00:40:46 2019 +0800

    DEV-52044 Add http proxy for argus

commit ef024be7d15bd181f60de612396b722d5c79dfe9
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:12:42 2019 +0800

    remove logo link

commit 538e9b30426b8e3c6336642a9fc12788a01b42a4
Merge: 421d5322 5c21dbdb
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:05:31 2019 +0800

    Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus into github_develop

    # Conflicts:
    #	pkg/devicegroup/devicegroup.go
    #	pkg/sync/initsyncer.go
    #	pkg/watch/node/node.go

commit d64d3d801fc1f280136634f9ee57195a902b234c
Author: dzxiao <[email protected]>
Date:   Tue Jun 18 14:44:20 2019 +0800

    DEV-52044 Add http proxy for argus

commit 421d53227978a5319bd5db724d754db4ea391b26
Merge: dfe477f0 a1df27e9
Author: Daizhong Xiao <[email protected]>
Date:   Sun Jun 16 22:15:14 2019 -0700

    Merge pull request #35 in DEV/k8s-argus from feature/DEV-52508-argus-deployment-rbac-privilege to develop

    * commit 'a1df27e9fe1f54653761bf16f2871e4ceb764fc0':
      DEV-52508 Fix the comments
      DEV-52508 Fix the comments
      DEV-52508 Improve by the comments
      DEV-52508 Argus deployment rbac privilege compatibility improvement
      DEV-52508 Argus deployment rbac privilege compatibility improvement
      DEV-52508 Argus deployment rbac privilege compatibility improvement
      DEV-52508 Argus deployment rbac privilege improve
      DEV-52508 Argus deployment rbac privilege improve
      DEV-52508 Fixed the CI check
      DEV-49675 Restore the dockerfile
      DEV-49675 Synchronous develop branch, add the recover panic logic for deployments
      DEV-50929 Improve the code with comments
      DEV-50929 Add k8s deployments monitoring by Argus

commit a1df27e9fe1f54653761bf16f2871e4ceb764fc0
Author: dzxiao <[email protected]>
Date:   Mon Jun 17 13:12:30 2019 +0800

    DEV-52508 Fix the comments

commit 2686988709be1794cc44aa45c262a20af4906344
Author: dzxiao <[email protected]>
Date:   Mon Jun 17 11:19:47 2019 +0800

    DEV-52508 Fix the comments

commit b516b2d9087d7c5e4a90f019901b7d03d6db1b63
Merge: 05517430 d139bb7b
Author: dzxiao <[email protected]>
Date:   Sun Jun 16 20:34:10 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit d139bb7ba86327f6d0b36490e7f6ad3c58fe3f20
Author: dzxiao <[email protected]>
Date:   Sun Jun 16 18:37:20 2019 +0800

    DEV-52508 Improve by the comments

commit 055174305631eac2063435d3562fd9d65d29a51b
Author: dzxiao <[email protected]>
Date:   Sun Jun 16 17:20:15 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit 7b000157dcc033deca162adeb0769b1db917cdcd
Author: dzxiao <[email protected]>
Date:   Fri Jun 14 15:03:50 2019 +0800

    DEV-52508 Argus deployment rbac privilege compatibility improvement

commit af73614888dffdc139300aedd95cf31e0957140c
Author: dzxiao <[email protected]>
Date:   Fri Jun 14 14:57:26 2019 +0800

    DEV-52508 Argus deployment rbac privilege compatibility improvement

commit d5f9ae0e16f6fa7b4296580963b9cad4eb4635fb
Author: dzxiao <[email protected]>
Date:   Fri Jun 14 14:19:52 2019 +0800

    DEV-52508 Argus deployment rbac privilege compatibility improvement

commit 302f10cc0c53caff37d421c60788596588664a25
Author: dzxiao <[email protected]>
Date:   Thu Jun 13 17:55:15 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit 7fee441867360d37c1c325b6b2e806f41be5028a
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 22:42:22 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit 87941be84bc906a24df91b7781108faa6c53b6d9
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 21:03:28 2019 +0800

    DEV-52508 Argus deployment rbac privilege improve

commit e313748af2fbab52b044e77c48894bc8abb37da9
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 18:20:41 2019 +0800

    DEV-52508 Argus deployment rbac privilege improve

commit f206d06555de7faefd6aa8038657fcdd5592f832
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 15:12:48 2019 +0800

    DEV-52508 Fixed the CI check

commit 68a9e6ffec2e49b06c075d2d33096be88ea96d12
Author: dzxiao <[email protected]>
Date:   Tue Jun 4 14:12:20 2019 +0800

    DEV-49675 Restore the dockerfile

commit c1b5a71562b4ccb758333c298d4fe6f0559d1dbf
Merge: 69cc809e dfe477f0
Author: dzxiao <[email protected]>
Date:   Tue Jun 4 14:08:50 2019 +0800

    DEV-49675 Merge from develop branch

commit dfe477f0c59670dc154b707f97169995bed04043
Merge: 823f4a19 32730de0
Author: Daizhong Xiao <[email protected]>
Date:   Thu May 30 23:21:02 2019 -0700

    Merge pull request #34 in DEV/k8s-argus from DEV-51932-fix-uptime-widget-for-k8s-resources to develop

    * commit '32730de08ee46917ca1a07e838a1fe87fa2dfa98':
      DEV-51932 fix uptime widget for k8s resources

commit 32730de08ee46917ca1a07e838a1fe87fa2dfa98
Author: dzxiao <[email protected]>
Date:   Thu May 30 10:29:19 2019 +0800

    DEV-51932 fix uptime widget for k8s resources

commit 823f4a194d45137a512754ed6cea1d03f5eeba50
Author: dzxiao <[email protected]>
Date:   Fri May 17 17:46:27 2019 +0800

    Improve the variable naming

commit 8c3a4e14a5909022d657e25987db8d03343032c3
Merge: 6e05ef5e 665b218b
Author: Daizhong Xiao <[email protected]>
Date:   Thu May 16 21:10:05 2019 -0700

    Merge pull request #33 in DEV/k8s-argus from DEV-51677-create-github-pr-for-argus-and to develop

    * commit '665b218b0fcfbbcd9613a9a4f3aa32144555eb28':
      DEV-51677 Improve the code according to github comments

commit 665b218b0fcfbbcd9613a9a4f3aa32144555eb28
Author: dzxiao <[email protected]>
Date:   Thu May 16 13:32:33 2019 +0800

    DEV-51677 Improve the code according to github comments

commit 6e05ef5e039d542356a597214f7c2a05683758c2
Author: dzxiao <[email protected]>
Date:   Wed May 15 18:39:09 2019 +0800

    Modify the format by Travis CI check

commit 69cc809e2d9a0e0b0b83ab5b53af2d38fc129a79
Merge: 57c574e2 9a4617c1
Author: dzxiao <[email protected]>
Date:   Tue May 14 14:05:20 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into feature/DEV-49675-devops-monitor-kubernetes-deployments

commit 9a4617c1aaecaa55860dd01c29bf2da3eb46b655
Merge: 2ca8da0a 1e77de01
Author: Daizhong Xiao <[email protected]>
Date:   Mon May 13 19:21:07 2019 -0700

    Merge pull request #32 in DEV/k8s-argus from bugfix/DEV-51567-the-label-value-of-k8s-monitored to develop

    * commit '1e77de018268bb0accc85e89fc7baa43a444b377':
      DEV-51567 Fixed the label value of k8s monitored

commit 2ca8da0a0015c6cf70e3d448113a326edfbb419c
Merge: cef2c2f4 5abe6823
Author: Daizhong Xiao <[email protected]>
Date:   Mon May 13 19:20:34 2019 -0700

    Merge pull request #31 in DEV/k8s-argus from DEV-51405-improve-argus-log to develop

    * commit '5abe6823912334b0c277ce7c0bc27e3f4efacc5e':
      DEV-51405 Fix the argus log format

commit 57c574e2cc36c888cdedce8d5c233308997ff45d
Author: dzxiao <[email protected]>
Date:   Tue May 14 09:57:44 2019 +0800

    DEV-49675 Synchronous develop branch, add the recover panic logic for deployments

commit 978c9a1d2ba920ab06735910844744aabd3f057b
Merge: 17a50a05 cef2c2f4
Author: dzxiao <[email protected]>
Date:   Tue May 14 09:50:41 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into feature/DEV-49675-devops-monitor-kubernetes-deployments

commit 1e77de018268bb0accc85e89fc7baa43a444b377
Author: dzxiao <[email protected]>
Date:   Mon May 13 22:10:15 2019 +0800

    DEV-51567 Fixed the label value of k8s monitored

commit 5abe6823912334b0c277ce7c0bc27e3f4efacc5e
Author: dzxiao <[email protected]>
Date:   Mon May 13 18:16:52 2019 +0800

    DEV-51405 Fix the argus log format

commit cef2c2f441da731e3f7d63d580bb997fd20aea92
Merge: 6d1787fc 58027d79
Author: dzxiao <[email protected]>
Date:   Mon May 13 15:17:37 2019 +0800

    DEV-49251 Merge improve-panic-log-process branch

commit 58027d79d79297a48e815895a17c9a5b5dd6a42d
Author: dzxiao <[email protected]>
Date:   Mon May 13 14:41:51 2019 +0800

    DEV-49251 Improve the comments

commit 6d1787fc3b618ee58bc0a39d17e30d64fbb3058a
Merge: 70702f72 8f80c6c2
Author: Daizhong Xiao <[email protected]>
Date:   Sun May 12 02:47:04 2019 -0700

    Merge pull request #28 in DEV/k8s-argus from DEV-50734-devts-6790-discover-nodeport-and to develop

    * commit '8f80c6c220cc1759176eb5056a9622295b6e9ede':
      DEV-50734 Improve the log message

commit 70702f720ccf1155a076c9d34a4776397e7d60d5
Merge: 50e6b2d5 100a7175
Author: Daizhong Xiao <[email protected]>
Date:   Sun May 12 02:44:27 2019 -0700

    Merge pull request #27 in DEV/k8s-argus from DEV-49251-improve-panic-log-process to develop

    * commit '100a717574d58a0c6b8fe642cf8f2b1082bb4eff':
      DEV-49251 Improve the log message

commit 100a717574d58a0c6b8fe642cf8f2b1082bb4eff
Author: dzxiao <[email protected]>
Date:   Sat May 11 16:37:52 2019 +0800

    DEV-49251 Improve the log message

commit 8f80c6c220cc1759176eb5056a9622295b6e9ede
Author: dzxiao <[email protected]>
Date:   Sat May 11 15:17:55 2019 +0800

    DEV-50734 Improve the log message

commit 17a50a058460412f7a1ec3e331864ea708a7f16b
Merge: 3944266b 50e6b2d5
Author: dzxiao <[email protected]>
Date:   Fri May 10 10:54:12 2019 +0800

    DEV-49675 Merge from develop branch

commit 3944266b1786910becee021eae0ada9133b2dafc
Merge: 3d9407c7 0e9d2093
Author: dzxiao <[email protected]>
Date:   Wed May 8 11:23:53 2019 +0800

    DEV-50929 Add k8s deployments monitoring by Argus

commit 50e6b2d5f14bf8e4d603dd4156074a7c4f4bd129
Merge: 3d9407c7 d45062ae
Author: Daizhong Xiao <[email protected]>
Date:   Tue May 7 20:05:39 2019 -0700

    Merge pull request #19 in DEV/k8s-argus from DEV-49251-improve-panic-log-process to develop

    * commit 'd45062aec7e6c684d1069723568dbd669cba82c7':
      DEV-49251 Add the defer to initSync and improve log output
      DEV-49251 improve panic log process

commit 0e9d20935a5d554b568c33246b3fdccbd04602f9
Author: dzxiao <[email protected]>
Date:   Tue May 7 18:32:06 2019 +0800

    DEV-50929 Improve the code with comments

commit 3d9407c7ab58ae66e784406bb3a9434cf4f446ed
Merge: 23f2cd3d 8e1b0e5c
Author: Jeremy Tang <[email protected]>
Date:   Tue May 7 03:02:15 2019 -0700

    Merge pull request #23 in DEV/k8s-argus from DEV-41301-upgrade-the-go-sdk-to-v2 to develop

    * commit '8e1b0e5ce9e328fd04f63580b9ec6e55eab8a35a':
      DEV-41301 Upgrade the go sdk to v2

commit 8e1b0e5ce9e328fd04f63580b9ec6e55eab8a35a
Author: JeremyCD <[email protected]>
Date:   Tue May 7 17:59:52 2019 +0800

    DEV-41301 Upgrade the go sdk to v2

commit 23f2cd3d6c3932cf48e74dc3778e8f243f37c91e
Merge: fa9fe857 69f8fb54
Author: Jeremy Tang <[email protected]>
Date:   Tue May 7 02:47:41 2019 -0700

    Merge pull request #21 in DEV/k8s-argus from DEV-41301-upgrade-the-go-sdk-to-v2 to develop

    * commit '69f8fb54b9df0a573f1415bcbb99070779cd975d': (21 commits)
      DEV-41301 Upgrade the go sdk to v2
      DEV-41301 Upgrade the go sdk to v2
      DEV-41301 Upgrade the go sdk to v2
      DEV-41301 Upgrade the go sdk to v2
      DEV-41301 Upgrade the go sdk to v2
      DEV-48974 Upgrade the go version of the argus from 1.9 to 1.11 (#104)
      DEV-48974 Upgrade Argus from golang 1.9 to 1.11
      Develop (#103)
      Dev 49046 fix the internal ip cannot found (#102)
      Update node_test.go
      Develop (#99)
      Dev 42060  improve the initSync and the branch of the lm sdk (#98)
      remove beta tag (#96)
      Remove beta tag (#97)
      Develop (#95)
      bump version
      Dev-40217 support to set log levels and improve (#94)
      Dev-40217 support to set log levels and improve
      Stash to GitHub (#92)
      Updating docs & readme (#91)
      ...

commit fa9fe857bfa78555d68037b10ba3ba999460ca3f
Merge: 55d703e5 f0997f0c
Author: Daizhong Xiao <[email protected]>
Date:   Tue May 7 02:41:57 2019 -0700

    Merge pull request #20 in DEV/k8s-argus from DEV-50734-devts-6790-discover-nodeport-and to develop

    * commit 'f0997f0c3bdc1ee58b92ce67b5569f1901952c31':
      DEV-50734 Support all service type, modify the UpdateFunc
      DEV-50734 Support all service type, and add the logs

commit d45062aec7e6c684d1069723568dbd669cba82c7
Author: dzxiao <[email protected]>
Date:   Tue May 7 17:11:48 2019 +0800

    DEV-49251 Add the defer to initSync and improve log output

commit 5f8afc4084864cc2053a92f5237d64f4633e8f57
Author: dzxiao <[email protected]>
Date:   Tue May 7 14:51:24 2019 +0800

    DEV-50929 Add k8s deployments monitoring by Argus

commit 69f8fb54b9df0a573f1415bcbb99070779cd975d
Author: JeremyCD <[email protected]>
Date:   Mon May 6 15:00:26 2019 +0800

    DEV-41301 Upgrade the go sdk to v2

commit f0997f0c3bdc1ee58b92ce67b5569f1901952c31
Author: dzxiao <[email protected]>
Date:   Mon May 6 14:50:43 2019 +0800

    DEV-50734 Support all service type, modify the UpdateFunc

commit 12fd071a3922302249c4b0e67ef53ffb0dd6d9fb
Author: JeremyCD <[email protected]>
Date:   Mon May 6 10:45:54 2019 +0800

    DEV-41301 Upgrade the go sdk to v2

commit db5aaed757fedcae6063f645011aa646c2ea3eef
Author: JeremyCD <[email protected]>
Date:   Sun May 5 21:39:13 2019 +0800

    DEV-41301 Upgrade the go sdk to v2

commit 21527a176b1d5fe6f841e90761b919b6c0d5a815
Author: JeremyCD <[email protected]>
Date:   Sun May 5 21:32:22 2019 +0800

    DEV-41301 Upgrade the go sdk to v2

commit 34a4ea2269f7b8477aa3ca3753e0b875ba6108ce
Author: JeremyCD <[email protected]>
Date:   Sun May 5 20:48:19 2019 +0800

    DEV-41301 Upgrade the go sdk to v2

commit e9d8d9059d3223fb96c9af6d534030dde532bba6
Author: dzxiao <[email protected]>
Date:   Fri Apr 26 23:11:57 2019 +0800

    DEV-50734 Support all service type, and add the logs

commit 5e8f8263c01ef1dea34b5806068f368a2eb0bf77
Author: dzxiao <[email protected]>
Date:   Fri Apr 26 22:07:24 2019 +0800

    DEV-49251 improve panic log process

commit 1a1fa4ee3782c6d2eb7a76589894e199f899e0b8
Merge: a77e88b8 2d6af211
Author: JeremyTangCD <[email protected]>
Date:   Thu Apr 25 10:57:13 2019 +0800

    Merge pull request #9 from logicmonitor/develop

    Develop

commit a77e88b8727de41884f2c216507a0403a5c012e1
Merge: f9d67593 ffacdd67
Author: JeremyTangCD <[email protected]>
Date:   Thu Feb 28 15:09:59 2019 +0800

    Merge pull request #8 from JeremyTangCD/DEV-48974-upgrade-argus-from-golang-1.9-to

    DEV-48974 Upgrade Argus from golang 1.9 to 1.11

commit ffacdd6772274686cbd4e7390227868e277c90bc
Author: jeremy <[email protected]>
Date:   Thu Feb 28 15:05:20 2019 +0800

    DEV-48974 Upgrade Argus from golang 1.9 to 1.11

commit f9d6759393118a050ca204217bae0a2d039d4120
Merge: cf2cdf08 261d0442
Author: JeremyTangCD <[email protected]>
Date:   Thu Feb 28 14:50:57 2019 +0800

    Merge pull request #7 from logicmonitor/develop

    Develop

commit cf2cdf08a64f0dd5cbb0a3d2909a3beab670e4c9
Merge: 2333cd41 ea104636
Author: JeremyTangCD <[email protected]>
Date:   Thu Feb 28 13:37:00 2019 +0800

    Merge pull request #6 from JeremyTangCD/DEV-48974-upgrade-argus-from-golang-1.9-to

    Dev 48974 upgrade argus from golang 1.9 to

commit 55d703e57e18c36a1715b42d60be4ff433a59288
Merge: 93e95d82 ea104636
Author: Jeremy Tang <[email protected]>
Date:   Wed Feb 20 23:07:00 2019 -0800

    Merge pull request #18 in DEV/k8s-argus from DEV-48974-upgrade-argus-from-golang-1.9-to to develop

    * commit 'ea10463692cb3b787e8bedc6f7442c75bad328bb':
      DEV-48974 Upgrade Argus from golang 1.9 to 1.11

commit ea10463692cb3b787e8bedc6f7442c75bad328bb
Author: jeremy <[email protected]>
Date:   Mon Feb 18 15:23:17 2019 +0800

    DEV-48974 Upgrade Argus from golang 1.9 to 1.11

commit 2333cd410641ed754b8bda4a880b886d0acb871c
Author: JeremyTangCD <[email protected]>
Date:   Mon Feb 18 15:20:02 2019 +0800

    Update node_test.go

commit 6293a0ad7e7f9724b76430a4a2d61e37cf250249
Merge: a0c3b2d7 2cc8d132
Author: JeremyTangCD <[email protected]>
Date:   Mon Feb 18 14:59:08 2019 +0800

    Merge pull request #5 from JeremyTangCD/DEV-49046-fix-the-internal-ip-cannot-found

    DEV-49046 Fix the internal IP cannot found bug in argus

commit 93e95d82e362046381b26d8cade3b715bf208d61
Merge: 838e88b7 2cc8d132
Author: Jeremy Tang <[email protected]>
Date:   Sun Feb 17 22:56:03 2019 -0800

    Merge pull request #17 in DEV/k8s-argus from DEV-49046-fix-the-internal-ip-cannot-found to develop

    * commit '2cc8d1326d9ced3f91b0f64b7f1a80407451eed4':
      DEV-49046 Fix the internal IP cannot found bug in argus

commit 2cc8d1326d9ced3f91b0f64b7f1a80407451eed4
Author: jeremy <[email protected]>
Date:   Mon Feb 18 14:48:58 2019 +0800

    DEV-49046 Fix the internal IP cannot found bug in argus

commit a0c3b2d7bda542ee678593c4c0251520143091f6
Merge: 7ecbcf68 8f7491d9
Author: JeremyTangCD <[email protected]>
Date:   Fri Feb 15 16:48:49 2019 +0800

    Merge branch 'develop' into develop

commit 7ecbcf689f93821fc07655ac8c61455fb74bce72
Merge: 3286dcd1 30932b00
Author: JeremyTangCD <[email protected]>
Date:   Fri Feb 15 16:44:48 2019 +0800

    Merge pull request #4 from JeremyTangCD/DEV-49046-fix-the-internal-ip-cannot-found

    Dev 49046 fix the internal ip cannot found

commit 838e88b7ac974ec3aa0c09404655cdeef07c3244
Merge: 746c3d95 30932b00
Author: Jeremy Tang <[email protected]>
Date:   Fri Feb 15 00:31:06 2019 -0800

    Merge pull request #16 in DEV/k8s-argus from DEV-49046-fix-the-internal-ip-cannot-found to develop

    * commit '30932b003b72fb8667d88c9436346f829c8bdc88':
      DEV-49046 Fix the internal IP cannot found bug in argus

commit 30932b003b72fb8667d88c9436346f829c8bdc88
Author: jeremy <[email protected]>
Date:   Thu Feb 14 16:06:19 2019 +0800

    DEV-49046 Fix the internal IP cannot found bug in argus

commit 746c3d9526e71fe8a064d416b908faa7d298feb8
Merge: 1d790d08 d65374e9
Author: Jeremy Tang <[email protected]>
Date:   Mon Jan 28 22:40:36 2019 -0800

    Merge pull request #15 in DEV/k8s-argus from DEV-47062-add-distinguishing-property-to to develop

    * commit 'd65374e91f1b332ba3749e7144addf7ebe23ba62':
      DEV-47062 Add distinguishing property to host network pods

commit d65374e91f1b332ba3749e7144addf7ebe23ba62
Author: jeremy <[email protected]>
Date:   Tue Jan 22 16:46:02 2019 +0800

    DEV-47062 Add distinguishing property to host network pods

commit 1d790d087b4a625ba49c969d7c40e994d6240cec
Merge: fc8f4f74 f1a712ee
Author: Jeremy Tang <[email protected]>
Date:   Mon Jan 14 17:38:02 2019 -0800

    Merge pull request #14 in DEV/k8s-argus from DEV-42060-don-t-create-collector-device-for to develop

    * commit 'f1a712ee08c609751a8ea68c3323afab56d1c55c':
      DEV-42060: Don't create collector device for Kubernetes Clusters

commit f1a712ee08c609751a8ea68c3323afab56d1c55c
Author: jeremy <[email protected]>
Date:   Mon Jan 14 15:34:48 2019 +0800

    DEV-42060: Don't create collector device for Kubernetes Clusters

commit fc8f4f74bd7980c94e8bf0641d32165a4128ac0e
Merge: f6349860 c69d4326
Author: Jeremy Tang <[email protected]>
Date:   Thu Jan 10 19:12:45 2019 -0800

    Merge pull request #13 in DEV/k8s-argus from DEV-41947-improve-the-initsync-logic-to-prevent to develop

    * commit 'c69d432600db453924bfeb6b9ab082883cb0bd8a':
      DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated
      DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated

commit c69d432600db453924bfeb6b9ab082883cb0bd8a
Author: jeremy <[email protected]>
Date:   Thu Jan 10 13:48:18 2019 +0800

    DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated

commit 06bdd1586ee0b7df373246adff0165e2c8883170
Author: jeremy <[email protected]>
Date:   Wed Jan 9 15:30:08 2019 +0800

    DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated

commit 3286dcd18f009e155cabeb505b0776101b4ae359
Author: JeremyTangCD <[email protected]>
Date:   Wed Jan 2 16:48:56 2019 +0800

    Dev-40217 support to set log levels and improve

    Dev-40217 support to set log levels and improve

commit b27023bd57511d6a3e02e254d04d0e705f2a5395
Merge: 2d0e5591 08e2f929
Author: JeremyTangCD <[email protected]>
Date:   Wed Jan 2 16:33:09 2019 +0800

    Merge branch 'develop' into develop

commit 2d0e5591b8758965470755f1e765f77accce6166
Merge: 66f8a962 f6349860
Author: JeremyTangCD <[email protected]>
Date:   Wed Jan 2 16:32:17 2019 +0800

    Merge pull request #3 from JeremyTangCD/DEV-40217-support-to-set-log-levels-and-improve

    Dev-40217 support to set log levels and improve

commit f6349860a04a91a8083773b5bec6ebafd7119661
Merge: 5a8c7980 968a0ad0
Author: Jeremy Tang <[email protected]>
Date:   Tue Dec 25 23:38:55 2018 -0800

    Merge pull request #11 in DEV/k8s-argus from DEV-40217-support-to-set-log-levels-and-improve to develop

    * commit '968a0ad080944f0a9c19b42f69c2dfc592a22ac8':
      DEV-40217: Support to set log levels and improve logs in argus related projects
      DEV-40217: Support to set log levels and improve logs in argus related projects

commit 5a8c7980f8da6e3fdc2dcc05eac919ef633eed63
Merge: 4079f661 e56e41e8
Author: Jeremy Tang <[email protected]>
Date:   Tue Dec 25 23:37:45 2018 -0800

    Merge pull request #12 in DEV/k8s-argus from DEV-41682-improve-the-argus-code-for-the to develop

    * commit 'e56e41e8efbe88814fcb2c0c4a6efc1240f09717':
      DEV-41682: Improve the argus code for the CI failure in GitHub

commit 66f8a9625ee59aa7d7df172cfa83c4375b73974b
Merge: a6f1cd13 e56e41e8
Author: JeremyTangCD <[email protected]>
Date:   Fri Dec 21 14:15:25 2018 +0800

    Merge pull request #1 from JeremyTangCD/DEV-41682-improve-the-argus-code-for-the

    DEV-41682: Improve the argus code for the CI failure in GitHub

commit e56e41e8efbe88814fcb2c0c4a6efc1240f09717
Author: jeremy <[email protected]>
Date:   Fri Dec 21 14:09:57 2018 +0800

    DEV-41682: Improve the argus code for the CI failure in GitHub

commit a6f1cd136ebf8aae649ec3361f274e11c30e05cd
Merge: 4079f661 c5d2b12f
Author: Jeff <[email protected]>
Date:   Thu Dec 20 16:37:24 2018 -0600

    Merge branch 'master' into develop

commit 968a0ad080944f0a9c19b42f69c2dfc592a22ac8
Author: jeremy <[email protected]>
Date:   Wed Dec 19 14:42:06 2018 +0800

    DEV-40217: Support to set log levels and improve logs in argus related projects

commit f35228a18f095dc616ee3ff9646110d54b674caa
Author: jeremy <[email protected]>
Date:   Tue Dec 18 17:14:26 2018 +0800

    DEV-40217: Support to set log levels and improve logs in argus related projects

commit 4079f661b68fe96d42a44c848e7eea004fdbde15
Merge: d570b4f6 e6152f8c
Author: Jeremy Tang <[email protected]>
Date:   Mon Dec 17 00:59:48 2018 -0800

    Merge pull request #10 in DEV/k8s-argus from DEV-41432-use-ip-as-hostname-for-argus-related to develop

    * commit 'e6152f8c1b2cc85aa50e75136a6da73f4482d72a':
      DEV-41432: Use IP as hostname for argus related devices

commit e6152f8c1b2cc85aa50e75136a6da73f4482d72a
Author: jeremy <[email protected]>
Date:   Mon Dec 17 16:56:13 2018 +0800

    DEV-41432: Use IP as hostname for argus related devices

commit d570b4f642e2dcb0383baacea2739e2ada36fbfc
Merge: 821500c6 eb4fffbf
Author: Jeremy Tang <[email protected]>
Date:   Fri Dec 14 01:29:00 2018 -0800

    Merge pull request #8 in DEV/k8s-argus from DEV-41432-use-ip-as-hostname-for-argus-related to develop

    * commit 'eb4fffbff02833af131710bd1b01d0ccbf32dc01':
      DEV-41432: Use IP as hostname for argus related devices
      DEV-41432: Use IP as hostname for argus related devices

commit 821500c60bc6796a8cbe3db4fc0bf90ca5edff27
Merge: d36f9439 16000b53
Author: Jeremy Tang <[email protected]>
Date:   Fri Dec 14 01:06:23 2018 -0800

    Merge pull request #9 in DEV/k8s-argus from DEV-41459-add-a-new-device-type-for-k8s-devices to develop

    * commit '16000b533b7e527c40fd042090ed27f590515ed8':
      DEV-41459: Add a new device type for k8s devices

commit 16000b533b7e527c40fd042090ed27f590515ed8
Author: jeremy <[email protected]>
Date:   Thu Dec 13 17:29:55 2018 +0800

    DEV-41459: Add a new device type for k8s devices

commit eb4fffbff02833af131710bd1b01d0ccbf32dc01
Author: jeremy <[email protected]>
Date:   Thu Dec 13 13:38:02 2018 +0800

    DEV-41432: Use IP as hostname for argus related devices

commit cc8efdae24b6698a93aa1a9598a0df7d96148080
Author: jeremy <[email protected]>
Date:   Tue Dec 11 18:02:03 2018 +0800

    DEV-41432: Use IP as hostname for argus related devices

commit d36f94399434298a9bec683fef137d2adc18b669
Merge: a03490e1 e7c90f10
Author: Jeremy Tang <[email protected]>
Date:   Thu Nov 15 02:05:53 2018 -0800

    Merge pull request #7 in DEV/k8s-argus from DEV-40779-enable-the-alert-on-service-group to develop

    * commit 'e7c90f107a58c371b749b7460384c10ca993bb3f':
      DEV-40779: Enable the alert on service group when it is created by argus

commit e7c90f107a58c371b749b7460384c10ca993bb3f
Author: jeremy <[email protected]>
Date:   Wed Nov 14 21:30:41 2018 +0800

    DEV-40779: Enable the alert on service group when it is created by argus

commit a03490e1a024198a24a250678bd1e41d34c98d02
Merge: 33c0a677 b4ce4883
Author: Jeremy Tang <[email protected]>
Date:   Fri Nov 9 16:30:47 2018 -0800

    Merge pull request #6 in DEV/k8s-argus from DEV-40505-sync-the-k8s-resource-to-santaba to develop

    * commit 'b4ce488353d7f5435ac1101437b712dc196ba633':
      DEV-40505: Sync the k8s resource to santaba when argus launches

commit b4ce488353d7f5435ac1101437b712dc196ba633
Author: jeremy <[email protected]>
Date:   Fri Nov 9 10:47:53 2018 +0800

    DEV-40505: Sync the k8s resource to santaba when argus launches

commit 33c0a677560615ff33327950e52245d721f6afdb
Merge: 58a91250 4058f07b
Author: Jeremy Tang <[email protected]>
Date:   Tue Nov 6 00:39:16 2018 -0800

    Merge pull request #4 in DEV/k8s-argus from bugfix/DEV-40434-the-alert-status-of-pods-and-services to develop

    * commit '4058f07bcd673d624b1e5e126efea081b86444f0':
      DEV-40434: The alert status of Pods and Services are disabled

commit 58a91250ea8ad2194b8268d0d186c2614d8a66d3
Merge: 3c03f960 e43a6a75
Author: Jeremy Tang <[email protected]>
Date:   Tue Nov 6 00:33:32 2018 -0800

    Merge pull request #3 in DEV/k8s-argus from DEV-40505-sync-the-k8s-resource-to-santaba to develop

    * commit 'e43a6a75c2da9437f9bec1271f8cbf498b560ab7':
      DEV-40505: Sync the k8s resource to santaba when argus launches
      DEV-40505: Sync the k8s resource to santaba when argus launches

commit e43a6a75c2da9437f9bec1271f8cbf498b560ab7
Author: jeremy <[email protected]>
Date:   Fri Nov 2 18:05:26 2018 +0800

    DEV-40505: Sync the k8s resource to santaba when argus launches

commit 4058f07bcd673d624b1e5e126efea081b86444f0
Author: jeremy <[email protected]>
Date:   Fri Nov 2 10:11:11 2018 +0800

    DEV-40434: The alert status of Pods and Services are disabled

commit 5dfab5be0c7a04cc11b107cf41d2948f878abf62
Author: jeremy <[email protected]>
Date:   Thu Nov 1 15:02:29 2018 +0800

    DEV-40505: Sync the k8s resource to santaba when argus launches

commit 3c03f9608e2560122a1ada64ac6f32e2f6fc12b7
Merge: 5735cb45 2d53e262
Author: Jeremy Tang <[email protected]>
Date:   Tue Oct 16 00:30:41 2018 -0700

    Merge pull request #2 in DEV/k8s-argus from DEV-39965-allow-the-user-to-specify-a-parent to develop

    * commit '2d53e262cb2536224e12a33a68e1ec18544018bf':
      DEV-39965: Allow the user to specify a parent group during installation

commit 2d53e262cb2536224e12a33a68e1ec18544018bf
Author: jeremy <[email protected]>
Date:   Tue Oct 16 15:28:41 2018 +0800

    DEV-39965: Allow the user to specify a parent group during installation

commit 5735cb45ceb088779398d8298961cd683c412d03
Merge: 18baf3e3 bb2c1f58
Author: Jeremy Tang <[email protected]>
Date:   Sun Oct 14 22:56:07 2018 -0700

    Merge pull request #1 in DEV/k8s-argus from DEV-39965-allow-the-user-to-specify-a-parent to develop

    * commit 'bb2c1f58e698be79c3098c103052bc3efa89d1bf':
      DEV-39965: Allow the user to specify a parent group during installation

commit bb2c1f58e698be79c3098c103052bc3efa89d1bf
Author: jeremy <[email protected]>
Date:   Fri Oct 12 10:02:53 2018 +0800

    DEV-39965: Allow the user to specify a parent group during installation

* DEV-58755: Updated image tag to new series i.e. v2latest

* Squashed commit of the following:

commit 3665b6b90ab9e7f2c054af22c73922803b3affa6
Merge: 8bb89557 622a3871
Author: Vaibhav Kumbhar <[email protected]>
Date:   Fri Apr 17 00:17:35 2020 -0700

    Merge pull request #46 in DEV/k8s-argus from DEV-58756-update-argus-image-tag-v2latest to develop

    * commit '622a38713fe247b769b10693f4607ab145fc53b2':
      DEV-58755: Updated image tag to new series i.e. v2latest

commit 622a38713fe247b769b10693f4607ab145fc53b2
Author: vaibhav.kumbhar <[email protected]>
Date:   Fri Apr 17 09:12:22 2020 +0530

    DEV-58755: Updated image tag to new series i.e. v2latest

commit 8bb8955788741f75678aae30a88cce1f7d22ee62
Merge: 2b299cf9 c1c91193
Author: Vaibhav Kumbhar <[email protected]>
Date:   Tue Apr 14 03:17:10 2020 -0700

    Merge pull request #45 in DEV/k8s-argus from feature/upgrade to develop

    * commit 'c1c91193139aa8a21599a3137644623cdae3c05a':
      Updated Golang sdk version to 1.14.1
      DEV-58267:  updated v1betv2 client to v1 for deployment watcher.
      feature/upgrade:  updated k8s sdk to 1.17 and client-go library to 14.0. and gosdk to 1.14 updated respective vendor packages accordingly

commit c1c91193139aa8a21599a3137644623cdae3c05a
Merge: 47b4945d 89a0cbdf
Author: Prathamesh Mahajan <[email protected]>
Date:   Mon Apr 6 00:02:44 2020 -0700

    Merge pull request #44 in DEV/k8s-argus from DEV-55196-update-k8s-sdk-1.17-client-go-14.0-lib-and-golang-image-1.14-for-argus to feature/upgrade

    * commit '89a0cbdfa5f452e932c5c028056dec0b88cf528a':
      Updated Golang sdk version to 1.14.1

commit 89a0cbdfa5f452e932c5c028056dec0b88cf528a
Author: [email protected] <[email protected]>
Date:   Mon Apr 6 11:17:37 2020 +0530

    Updated Golang sdk version to 1.14.1

commit 47b4945d9a035e9b8d3a22a0559a005dd3e0d135
Merge: b628107a 753ff7ac
Author: Vaibhav Kumbhar <[email protected]>
Date:   Sun Apr 5 22:01:52 2020 -0700

    Merge pull request #43 in DEV/k8s-argus from DEV-58267-change-deployment-client-to-apps-v1-apps-v1betv2-is-no-more-could-not-list-deployments to feature/upgrade

    * commit '753ff7ac22ea8517204025937da6f7acc494f207':
      DEV-58267:  updated v1betv2 client to v1 for deployment watcher.

commit 753ff7ac22ea8517204025937da6f7acc494f207
Author: vaibhav.kumbhar <[email protected]>
Date:   Fri Apr 3 12:30:08 2020 +0530

    DEV-58267:  updated v1betv2 client to v1 for deployment watcher.

commit b628107a999979bc59150cf6c8a506ba67d3489a
Author: vaibhav.kumbhar <[email protected]>
Date:   Fri Mar 6 17:29:49 2020 +0530

    feature/upgrade:  updated k8s sdk to 1.17 and client-go library to 14.0.
    and gosdk to 1.14
    updated respective vendor packages accordingly

commit 2b299cf9e48e4d130a2c8fc8c6d7efceddbc4092
Merge: 9885f238 6425fd62
Author: Jeremy Tang <[email protected]>
Date:   Wed Nov 13 18:07:04 2019 -0800

    Merge pull request #42 in DEV/k8s-argus from DEV-55114-argus-shouldn-t-overwrite-system.categories-values to develop

    * commit '6425fd625a11efc821b3efe4e579ae991f212915':
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values
      DEV-55114 Argus shouldn't overwrite system.categories values

commit 6425fd625a11efc821b3efe4e579ae991f212915
Author: JeremyCD <[email protected]>
Date:   Tue Nov 12 14:08:30 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit edd79ad45353cd337a2d5de480e9aee9e1d86353
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 17:50:34 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit 1a9d37ef2a86991cee9093fdc121aeb0858d4f59
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 17:37:21 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit c4a5efaf347a0a213f7dc81722b91295d0caf712
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 16:05:34 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit ab0f882b8f6d6dd6e5a084d5ba8cf9ef6dc51335
Author: JeremyCD <[email protected]>
Date:   Mon Nov 11 15:42:06 2019 +0800

    DEV-55114 Argus shouldn't overwrite system.categories values

commit 9885f2383d9e71bc8c8d4dc3d594ce13e76d625b
Merge: b049bd02 bacb005d
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jul 29 19:27:55 2019 -0700

    Merge pull request #41 in DEV/k8s-argus from DEV-53516-create-pr-for-supporting-http-proxy to develop

    * commit 'bacb005de10033300a34ac6ff4eb1d431eb724ec':
      DEV-53516 Create PR for supporting http proxy configuration
      Develop (#112)
      Develop (#111)
      Develop (#109)

commit bacb005de10033300a34ac6ff4eb1d431eb724ec
Merge: 0806e097 ad09dcdf
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 15:31:01 2019 +0800

    Merge branch 'develop' of https://github.com/DzXiaoLMCD/k8s-argus into DEV-53516-create-pr-for-supporting-http-proxy

commit 0806e097a53e376ae8fb8e772ae5a6480e541c07
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 15:27:17 2019 +0800

    DEV-53516 Create PR for supporting http proxy configuration

commit ad09dcdf69cbf9f9639ea2e48b51b88becc02c73
Merge: b049bd02 8db30a43
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 15:20:21 2019 +0800

    Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus into dz_github_develop

commit b049bd022903c2a93e008b6a116ecdb91c436d29
Merge: c7c0e2d9 9d5d89e1
Author: Daizhong Xiao <[email protected]>
Date:   Tue Jul 23 17:57:38 2019 -0700

    Merge pull request #40 in DEV/k8s-argus from DEV-52692-support-proxy-for-dockerized-collector to develop

    * commit '9d5d89e18eafedf8d4c01d02b36b7d8545e5cabb':
      DEV-52692 Support proxy for dockerized collector
      DEV-52692 fix the comments
      DEV-52692 fix the comments
      DEV-52044 Improve the http proxy configuration
      DEV-52044 Improve the http proxy configuration
      DEV-52044 Fix the comments
      DEV-52044 Fix the comments
      DEV-52044 Add httpURL parameter description
      DEV-52044 Add httpURL parameter description
      DEV-52044 Add http proxy for argus
      DEV-52044 Add http proxy for argus
      DEV-51952 Research argus http & http proxy configuration options
      DEV-51952 Research argus http & http proxy configuration options

commit 9d5d89e18eafedf8d4c01d02b36b7d8545e5cabb
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 16:02:52 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit 488da04a40be217d03148d60b8bb09387300d9a5
Merge: 05ebe17b c7c0e2d9
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 14:09:02 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into DEV-52692-support-proxy-for-dockerized-collector

commit 05ebe17b9591ba2a82c02aef0b1c66a840803e4b
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 18:08:24 2019 +0800

    DEV-52692 fix the comments

commit 8561f9d455961cf8163b0226119d1ea1a8cfb488
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 18:05:47 2019 +0800

    DEV-52692 fix the comments

commit c7c0e2d9a1f710759cefa6472f08780ae9a12221
Merge: 6921bc31 72f2ee82
Author: Daizhong Xiao <[email protected]>
Date:   Wed Jul 3 19:34:28 2019 -0700

    Merge pull request #39 in DEV/k8s-argus from DEV-52991-create-pr-for-duplicate-pod-names to develop

    * commit '72f2ee826bf9563bb3e9c6a718a490a6defa78d2':
      DEV-52991 Add UT
      DEV-52036 Fix the comments
      DEV-52036 Fix the comments
      DEV-52036 Allow for duplicate pod names in one LM account
      DEV-52036 Allow for duplicate pod names in one LM account
      DEV-52036 Allow for duplicate pod names in one LM account
      remove logo link
      DEV-52036 Allow for duplicate pod names in one LM account

commit 72f2ee826bf9563bb3e9c6a718a490a6defa78d2
Author: dzxiao <[email protected]>
Date:   Wed Jul 3 14:14:07 2019 +0800

    DEV-52991 Add UT

commit a5e616a081a24d6a5f4d200fbdf9f50618f8c174
Merge: e2942642 ef024be7
Author: dzxiao <[email protected]>
Date:   Tue Jul 2 15:35:03 2019 +0800

    Merge branch 'develop' of https://github.com/DzXiaoLMCD/k8s-argus into DEV-52991-create-pr-for-duplicate-pod-names

commit e294264215a78b6caa13c47c9d6d8299ac098f6a
Merge: 6921bc31 41a2dc00
Author: dzxiao <[email protected]>
Date:   Tue Jul 2 09:42:48 2019 +0800

    Merge branch 'DEV-52036-allow-for-duplicate-pod-names-in' of https://stash.logicmonitor.com/scm/dev/k8s-argus into DEV-52991-create-pr-for-duplicate-pod-names

commit 41a2dc000e81cb412a50c56c1eaff868a9107c7f
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 04:38:28 2019 +0800

    DEV-52036 Fix the comments

commit 298b037a1c6b48ff82de52b3756e0131833a95b8
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 03:48:18 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit f82a0bf914fcaabac954f0fe5d9d056690273f03
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 01:48:40 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 1829b56d403fe32c5d579b82891cb1a7932e9315
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 19:04:51 2019 +0800

    DEV-52036 Fix the comments

commit 361a3789ca469c34253bd1f8d889f989ad32b81e
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:52:31 2019 +0800

    DEV-52044 Fix the comments

commit 4534a641f0682396cf91ca12f46f9ada3e23ccb0
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:17:49 2019 +0800

    DEV-52044 Fix the comments

commit 569edd31c64d82e92c9beff3a789ee2a3d5bd7e1
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 08:51:07 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 99542e70a03c5e56080ea57d2d05641f1cd0c597
Merge: 2d1cd4bb 6921bc31
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 08:48:16 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into feature/DEV-52044-add-http-http-proxy-configuration

commit 6921bc31b2edbea9f37da3c99596654426f6ca80
Merge: 421d5322 34b0bf18
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 19:03:27 2019 +0800

    Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus into develop

    # Conflicts:
    #	pkg/sync/initsyncer.go

commit 2d1cd4bbf1ca7080bc23139a83cda4a9596f33d5
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 18:31:02 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 203f978a06c79398633da7bd5411ea932d0e9c32
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 17:54:07 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit 9fe97da53de0d1e8096b2a8678de84fc16b03c0a
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 16:11:02 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit a0d2ab0cfef9707253996f3ac377f88261bb52af
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 16:04:29 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit c82803014cf482b45ab2c741d7977d40a9b94d52
Merge: b516b2d9 421d5322
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 01:35:52 2019 +0800

    Merge branch 'develop' of https://stash.logicmonitor.com/scm/dev/k8s-argus into DEV-52036-allow-for-duplicate-pod-names-in

commit 3aada1f6de258296443a79d5a45b7c55bee44fcf
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 00:40:46 2019 +0800

    DEV-52044 Add http proxy for argus

commit ef024be7d15bd181f60de612396b722d5c79dfe9
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:12:42 2019 +0800

    remove logo link

commit 538e9b30426b8e3c6336642a9fc12788a01b42a4
Merge: 421d5322 5c21dbdb
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:05:31 2019 +0800

    Merge branch 'develop' of https://github.com/logicmonitor/k8s-argus into github_develop

    # Conflicts:
    #	pkg/devicegroup/devicegroup.go
    #	pkg/sync/initsyncer.go
    #	pkg/watch/node/node.go

commit d64d3d801fc1f280136634f9ee57195a902b234c
Author: dzxiao <[email protected]>
Date:   Tue Jun 18 14:44:20 2019 +0800

    DEV-52044 Add http proxy for argus

commit 421d53227978a5319bd5db724d754db4ea391b26
Merge: dfe477f0 a1df27e9
Author: Daizhong Xiao <[email protected]>
Date:   Sun Jun 16 22:15:14 2019 -0700

    Merge pull request #35 in DEV/k8s-argus from feature/DEV-52508-argus-deployment-rbac-privilege to develop

    * commit 'a1df27e9fe1f54653761bf16f2871e4ceb764fc0':
      DEV-52508 Fix the comments
      DEV-52508 Fix the comments
      DEV-52508 Improve by the comments
      DEV-52508 Argus deployment rbac privilege compatibility improvement
      DEV-52508 Argus deployment rbac privilege compatibility improvement
      DEV-52508 Argus deployment rbac privilege compatibility improvement
      DEV-52508 Argus deployment rbac privilege improve
      DEV-52508 Argus deployment rbac privilege improve
      DEV-52508 Fixed the CI check
      DEV-49675 Restore the dockerfile
      DEV-49675 Synchronous develop branch, add the recover panic logic for deployments
      DEV-50929 Improve the code with comments
      DEV-50929 Add k8s deployments monitoring by Argus

commit a1df27e9fe1f54653761bf16f2871e4ceb764fc0
Author: dzxiao <[email protected]>
Date:   Mon Jun 17 13:12:30 2019 +0800

    DEV-52508 Fix the comments

commit 2686988709be1794cc44aa45c262a20af4906344
Author: dzxiao <[email protected]>
Date:   Mon Jun 17 11:19:47 2019 +0800

    DEV-52508 Fix the comments

commit b516b2d9087d7c5e4a90f019901b7d03d6db1b63
Merge: 05517430 d139bb7b
Author: dzxiao <[email protected]>
Date:   Sun Jun 16 20:34:10 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit d139bb7ba86327f6d0b36490e7f6ad3c58fe3f20
Author: dzxiao <[email protected]>
Date:   Sun Jun 16 18:37:20 2019 +0800

    DEV-52508 Improve by the comments

commit 055174305631eac2063435d3562fd9d65d29a51b
Author: dzxiao <[email protected]>
Date:   Sun Jun 16 17:20:15 2019 +0800

    DEV-52036 Allow for duplicate pod names in one LM account

commit 7b000157dcc033deca162adeb0769b1db917cdcd
Author: dzxiao <[email protected]>
Date:   Fri Jun 14 15:03:50 2019 +0800

    DEV-52508 Argus deployment rbac privilege compatibility improvement

commit af73614888dffdc139300aedd95cf31e0957140c
Author: dzxiao <[email protected]>
Date:   Fri Jun 14 14:57:26 2019 +0800

    DEV-52508 Argus deployment rbac privilege compatibility improvement

commit d5f9ae0e16f6fa7b4296580963b9cad4eb4635fb
Author: dzxiao <[email protected]>
Date:   Fri Jun 14 14:19:52 2019 +0800

    DEV-52508 Argus deployment rbac privilege compatibility improvement

commit 302f10cc0c53caff37d421c60788596588664a25
Author: dzxiao <[email protected]>
Date:   Thu Jun 13 17:55:15 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit 7fee441867360d37c1c325b6b2e806f41be5028a
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 22:42:22 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit 87941be84bc906a24df91b7781108faa6c53b6d9
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 21:03:28 2019 +0800

    DEV-52508 Argus deployment rbac privilege improve

commit e313748af2fbab52b044e77c48894bc8abb37da9
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 18:20:41 2019 +0800

    DEV-52508 Argus deployment rbac privilege improve

commit f206d06555de7faefd6aa8038657fcdd5592f832
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 15:12:48 2019 +0800

    DEV-52508 Fixed the CI check

commit 68a9e6ffec2e49b06c075d2d33096be88ea96d12
Author: dzxiao <[email protected]>
Date:   Tue Jun 4 14:12:20 2019 +0800

    DEV-49675 Restore the dockerfile

commit c1b5a71562b4ccb758333c298d4fe6f0559d1dbf
Merge: 69cc809e dfe477f0
Author: dzxiao <[email protected]>
Date:   Tue Jun 4 14:08:50 2019 +0800

    DEV-49675 Merge from develop branch

commit dfe477f0c59670dc154b707f97169995bed04043
Merge: 823f4a19 32730de0
Author: Daizhong Xiao <[email protected]>
Date:   Thu May 30 23:21:02 2019 -0700

    Merge pull request #34 in DEV/k8s-argus from DEV-51932-fix-uptime-widget-for-k8s-resources to develop

    * commit '32730de08ee46917ca1a07e838a1fe87fa2dfa98':
      DEV-51932 fix uptime widget for k8s resources

commit 32730de08ee46917ca1a07e838a1fe87fa2dfa98
Author: dzxiao <[email protected]>
Date:   Thu May 30 10:29:19 2019 +0800

    DEV-51932 fix uptime widget for k8s resources

commit 823f4a194d45137a512754ed6cea1d03f5eeba50
Author: dzxiao <[email protected]>
Date:   Fri May 17 17:46:27 2019 +0800

    Improve the variable naming

commit 8c3a4e14a5909022d657e25987db8d03343032c3
Merge: 6e05ef5e 665b218b
Author: Daizhong Xiao <[email protected]>
Date:   Thu May 16 21:10:05 2019 -0700

    Merge pull request #33 in DEV/k8s-argus from DEV-51677-create-github-pr-for-argus-and to develop

    * commit '665b218b0fcfbbcd9613a9a4f3aa32144555eb28':
      DEV-51677 Improve the code according to github comments

commit 665b218b0fcfbbcd9613a9a4f3aa32144555eb28
Author: dzxiao <[email protected]>
Date:   Thu May …
  • Loading branch information
@vkumbhar94 @lmvaibhavk
@woz5999 @JeremyTangCD @DzXiaoLMCD @prathameshmahajan28 @kaladaLM18 @pranay-lonkar-logicmonitor @lmshubhashri @shubhashri12 @pranaylonkar19 @rohitphataklm
14 people authored Oct 5, 2021
1 parent eaca425 commit 3407bd1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/sync/initsyncer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func (i *InitSyncer) deleteResource(lctx *lmctx.LMContext, log *logrus.Entry, re
i.ResourceManager.GetResourceCache().Unset(lctx, resourceName, resourceMeta.Container)
log.Tracef("Deleted dangling resource %s with id: %v", resourceName.Name, resourceMeta.LMID)
}
} else {
} else if !resourceMeta.HasSysCategory(resourceName.Resource.GetDeletedCategory()) {
log.Info("Soft delete")
deleteOptions := i.ResourceManager.GetMarkDeleteOptions(lctx, resourceName.Resource, meta.AsPartialObjectMetadata(&metav1.ObjectMeta{}))

Expand Down

0 comments on commit 3407bd1

Please sign in to comment.