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

Commit 6ac5c08

Browse files
committed
Squashed commit of the following:
commit 8bb8955 Merge: 2b299cf c1c9119 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 c1c9119 Merge: 47b4945 89a0cbd 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 89a0cbd Author: [email protected] <[email protected]> Date: Mon Apr 6 11:17:37 2020 +0530 Updated Golang sdk version to 1.14.1 commit 47b4945 Merge: b628107 753ff7a 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 753ff7a 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 b628107 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 2b299cf Merge: 9885f23 6425fd6 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 6425fd6 Author: JeremyCD <[email protected]> Date: Tue Nov 12 14:08:30 2019 +0800 DEV-55114 Argus shouldn't overwrite system.categories values commit edd79ad Author: JeremyCD <[email protected]> Date: Mon Nov 11 17:50:34 2019 +0800 DEV-55114 Argus shouldn't overwrite system.categories values commit 1a9d37e Author: JeremyCD <[email protected]> Date: Mon Nov 11 17:37:21 2019 +0800 DEV-55114 Argus shouldn't overwrite system.categories values commit c4a5efa Author: JeremyCD <[email protected]> Date: Mon Nov 11 16:05:34 2019 +0800 DEV-55114 Argus shouldn't overwrite system.categories values commit ab0f882 Author: JeremyCD <[email protected]> Date: Mon Nov 11 15:42:06 2019 +0800 DEV-55114 Argus shouldn't overwrite system.categories values commit 9885f23 Merge: b049bd0 bacb005 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 bacb005 Merge: 0806e09 ad09dcd 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 0806e09 Author: dzxiao <[email protected]> Date: Mon Jul 29 15:27:17 2019 +0800 DEV-53516 Create PR for supporting http proxy configuration commit ad09dcd Merge: b049bd0 8db30a4 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 b049bd0 Merge: c7c0e2d 9d5d89e 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 9d5d89e Author: dzxiao <[email protected]> Date: Fri Jul 19 16:02:52 2019 +0800 DEV-52692 Support proxy for dockerized collector commit 488da04 Merge: 05ebe17 c7c0e2d 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 05ebe17 Author: dzxiao <[email protected]> Date: Thu Jul 18 18:08:24 2019 +0800 DEV-52692 fix the comments commit 8561f9d Author: dzxiao <[email protected]> Date: Thu Jul 18 18:05:47 2019 +0800 DEV-52692 fix the comments commit c7c0e2d Merge: 6921bc3 72f2ee8 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 72f2ee8 Author: dzxiao <[email protected]> Date: Wed Jul 3 14:14:07 2019 +0800 DEV-52991 Add UT commit a5e616a Merge: e294264 ef024be 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 e294264 Merge: 6921bc3 41a2dc0 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 41a2dc0 Author: dzxiao <[email protected]> Date: Sat Jun 22 04:38:28 2019 +0800 DEV-52036 Fix the comments commit 298b037 Author: dzxiao <[email protected]> Date: Sat Jun 22 03:48:18 2019 +0800 DEV-52044 Improve the http proxy configuration commit f82a0bf Author: dzxiao <[email protected]> Date: Sat Jun 22 01:48:40 2019 +0800 DEV-52044 Improve the http proxy configuration commit 1829b56 Author: dzxiao <[email protected]> Date: Fri Jun 21 19:04:51 2019 +0800 DEV-52036 Fix the comments commit 361a378 Author: dzxiao <[email protected]> Date: Fri Jun 21 15:52:31 2019 +0800 DEV-52044 Fix the comments commit 4534a64 Author: dzxiao <[email protected]> Date: Fri Jun 21 15:17:49 2019 +0800 DEV-52044 Fix the comments commit 569edd3 Author: dzxiao <[email protected]> Date: Fri Jun 21 08:51:07 2019 +0800 DEV-52044 Add httpURL parameter description commit 99542e7 Merge: 2d1cd4b 6921bc3 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 6921bc3 Merge: 421d532 34b0bf1 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 2d1cd4b Author: dzxiao <[email protected]> Date: Thu Jun 20 18:31:02 2019 +0800 DEV-52044 Add httpURL parameter description commit 203f978 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 9fe97da 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 a0d2ab0 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 c828030 Merge: b516b2d 421d532 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 3aada1f Author: dzxiao <[email protected]> Date: Thu Jun 20 00:40:46 2019 +0800 DEV-52044 Add http proxy for argus commit ef024be Author: dzxiao <[email protected]> Date: Wed Jun 19 17:12:42 2019 +0800 remove logo link commit 538e9b3 Merge: 421d532 5c21dbd 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 d64d3d8 Author: dzxiao <[email protected]> Date: Tue Jun 18 14:44:20 2019 +0800 DEV-52044 Add http proxy for argus commit 421d532 Merge: dfe477f a1df27e 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 a1df27e Author: dzxiao <[email protected]> Date: Mon Jun 17 13:12:30 2019 +0800 DEV-52508 Fix the comments commit 2686988 Author: dzxiao <[email protected]> Date: Mon Jun 17 11:19:47 2019 +0800 DEV-52508 Fix the comments commit b516b2d Merge: 0551743 d139bb7 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 d139bb7 Author: dzxiao <[email protected]> Date: Sun Jun 16 18:37:20 2019 +0800 DEV-52508 Improve by the comments commit 0551743 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 7b00015 Author: dzxiao <[email protected]> Date: Fri Jun 14 15:03:50 2019 +0800 DEV-52508 Argus deployment rbac privilege compatibility improvement commit af73614 Author: dzxiao <[email protected]> Date: Fri Jun 14 14:57:26 2019 +0800 DEV-52508 Argus deployment rbac privilege compatibility improvement commit d5f9ae0 Author: dzxiao <[email protected]> Date: Fri Jun 14 14:19:52 2019 +0800 DEV-52508 Argus deployment rbac privilege compatibility improvement commit 302f10c Author: dzxiao <[email protected]> Date: Thu Jun 13 17:55:15 2019 +0800 DEV-51952 Research argus http & http proxy configuration options commit 7fee441 Author: dzxiao <[email protected]> Date: Wed Jun 12 22:42:22 2019 +0800 DEV-51952 Research argus http & http proxy configuration options commit 87941be Author: dzxiao <[email protected]> Date: Wed Jun 12 21:03:28 2019 +0800 DEV-52508 Argus deployment rbac privilege improve commit e313748 Author: dzxiao <[email protected]> Date: Wed Jun 12 18:20:41 2019 +0800 DEV-52508 Argus deployment rbac privilege improve commit f206d06 Author: dzxiao <[email protected]> Date: Wed Jun 12 15:12:48 2019 +0800 DEV-52508 Fixed the CI check commit 68a9e6f Author: dzxiao <[email protected]> Date: Tue Jun 4 14:12:20 2019 +0800 DEV-49675 Restore the dockerfile commit c1b5a71 Merge: 69cc809 dfe477f Author: dzxiao <[email protected]> Date: Tue Jun 4 14:08:50 2019 +0800 DEV-49675 Merge from develop branch commit dfe477f Merge: 823f4a1 32730de 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 32730de Author: dzxiao <[email protected]> Date: Thu May 30 10:29:19 2019 +0800 DEV-51932 fix uptime widget for k8s resources commit 823f4a1 Author: dzxiao <[email protected]> Date: Fri May 17 17:46:27 2019 +0800 Improve the variable naming commit 8c3a4e1 Merge: 6e05ef5 665b218 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 665b218 Author: dzxiao <[email protected]> Date: Thu May 16 13:32:33 2019 +0800 DEV-51677 Improve the code according to github comments commit 6e05ef5 Author: dzxiao <[email protected]> Date: Wed May 15 18:39:09 2019 +0800 Modify the format by Travis CI check commit 69cc809 Merge: 57c574e 9a4617c 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 9a4617c Merge: 2ca8da0 1e77de0 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 2ca8da0 Merge: cef2c2f 5abe682 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 57c574e 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 978c9a1 Merge: 17a50a0 cef2c2f 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 1e77de0 Author: dzxiao <[email protected]> Date: Mon May 13 22:10:15 2019 +0800 DEV-51567 Fixed the label value of k8s monitored commit 5abe682 Author: dzxiao <[email protected]> Date: Mon May 13 18:16:52 2019 +0800 DEV-51405 Fix the argus log format commit cef2c2f Merge: 6d1787f 58027d7 Author: dzxiao <[email protected]> Date: Mon May 13 15:17:37 2019 +0800 DEV-49251 Merge improve-panic-log-process branch commit 58027d7 Author: dzxiao <[email protected]> Date: Mon May 13 14:41:51 2019 +0800 DEV-49251 Improve the comments commit 6d1787f Merge: 70702f7 8f80c6c 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 70702f7 Merge: 50e6b2d 100a717 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 100a717 Author: dzxiao <[email protected]> Date: Sat May 11 16:37:52 2019 +0800 DEV-49251 Improve the log message commit 8f80c6c Author: dzxiao <[email protected]> Date: Sat May 11 15:17:55 2019 +0800 DEV-50734 Improve the log message commit 17a50a0 Merge: 3944266 50e6b2d Author: dzxiao <[email protected]> Date: Fri May 10 10:54:12 2019 +0800 DEV-49675 Merge from develop branch commit 3944266 Merge: 3d9407c 0e9d209 Author: dzxiao <[email protected]> Date: Wed May 8 11:23:53 2019 +0800 DEV-50929 Add k8s deployments monitoring by Argus commit 50e6b2d Merge: 3d9407c d45062a 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 0e9d209 Author: dzxiao <[email protected]> Date: Tue May 7 18:32:06 2019 +0800 DEV-50929 Improve the code with comments commit 3d9407c Merge: 23f2cd3 8e1b0e5 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 8e1b0e5 Author: JeremyCD <[email protected]> Date: Tue May 7 17:59:52 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit 23f2cd3 Merge: fa9fe85 69f8fb5 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 fa9fe85 Merge: 55d703e f0997f0 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 d45062a 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 5f8afc4 Author: dzxiao <[email protected]> Date: Tue May 7 14:51:24 2019 +0800 DEV-50929 Add k8s deployments monitoring by Argus commit 69f8fb5 Author: JeremyCD <[email protected]> Date: Mon May 6 15:00:26 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit f0997f0 Author: dzxiao <[email protected]> Date: Mon May 6 14:50:43 2019 +0800 DEV-50734 Support all service type, modify the UpdateFunc commit 12fd071 Author: JeremyCD <[email protected]> Date: Mon May 6 10:45:54 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit db5aaed Author: JeremyCD <[email protected]> Date: Sun May 5 21:39:13 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit 21527a1 Author: JeremyCD <[email protected]> Date: Sun May 5 21:32:22 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit 34a4ea2 Author: JeremyCD <[email protected]> Date: Sun May 5 20:48:19 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit e9d8d90 Author: dzxiao <[email protected]> Date: Fri Apr 26 23:11:57 2019 +0800 DEV-50734 Support all service type, and add the logs commit 5e8f826 Author: dzxiao <[email protected]> Date: Fri Apr 26 22:07:24 2019 +0800 DEV-49251 improve panic log process commit 1a1fa4e Merge: a77e88b 2d6af21 Author: JeremyTangCD <[email protected]> Date: Thu Apr 25 10:57:13 2019 +0800 Merge pull request #9 from logicmonitor/develop Develop commit a77e88b Merge: f9d6759 ffacdd6 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 ffacdd6 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 f9d6759 Merge: cf2cdf0 261d044 Author: JeremyTangCD <[email protected]> Date: Thu Feb 28 14:50:57 2019 +0800 Merge pull request #7 from logicmonitor/develop Develop commit cf2cdf0 Merge: 2333cd4 ea10463 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 55d703e Merge: 93e95d8 ea10463 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 ea10463 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 2333cd4 Author: JeremyTangCD <[email protected]> Date: Mon Feb 18 15:20:02 2019 +0800 Update node_test.go commit 6293a0a Merge: a0c3b2d 2cc8d13 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 93e95d8 Merge: 838e88b 2cc8d13 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 2cc8d13 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 a0c3b2d Merge: 7ecbcf6 8f7491d Author: JeremyTangCD <[email protected]> Date: Fri Feb 15 16:48:49 2019 +0800 Merge branch 'develop' into develop commit 7ecbcf6 Merge: 3286dcd 30932b0 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 838e88b Merge: 746c3d9 30932b0 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 30932b0 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 746c3d9 Merge: 1d790d0 d65374e 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 d65374e Author: jeremy <[email protected]> Date: Tue Jan 22 16:46:02 2019 +0800 DEV-47062 Add distinguishing property to host network pods commit 1d790d0 Merge: fc8f4f7 f1a712e 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 f1a712e Author: jeremy <[email protected]> Date: Mon Jan 14 15:34:48 2019 +0800 DEV-42060: Don't create collector device for Kubernetes Clusters commit fc8f4f7 Merge: f634986 c69d432 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 c69d432 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 06bdd15 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 3286dcd 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 b27023b Merge: 2d0e559 08e2f92 Author: JeremyTangCD <[email protected]> Date: Wed Jan 2 16:33:09 2019 +0800 Merge branch 'develop' into develop commit 2d0e559 Merge: 66f8a96 f634986 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 f634986 Merge: 5a8c798 968a0ad 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 5a8c798 Merge: 4079f66 e56e41e 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 66f8a96 Merge: a6f1cd1 e56e41e 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 e56e41e 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 a6f1cd1 Merge: 4079f66 c5d2b12 Author: Jeff <[email protected]> Date: Thu Dec 20 16:37:24 2018 -0600 Merge branch 'master' into develop commit 968a0ad 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 f35228a 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 4079f66 Merge: d570b4f e6152f8 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 e6152f8 Author: jeremy <[email protected]> Date: Mon Dec 17 16:56:13 2018 +0800 DEV-41432: Use IP as hostname for argus related devices commit d570b4f Merge: 821500c eb4fffb 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 821500c Merge: d36f943 16000b5 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 16000b5 Author: jeremy <[email protected]> Date: Thu Dec 13 17:29:55 2018 +0800 DEV-41459: Add a new device type for k8s devices commit eb4fffb Author: jeremy <[email protected]> Date: Thu Dec 13 13:38:02 2018 +0800 DEV-41432: Use IP as hostname for argus related devices commit cc8efda Author: jeremy <[email protected]> Date: Tue Dec 11 18:02:03 2018 +0800 DEV-41432: Use IP as hostname for argus related devices commit d36f943 Merge: a03490e e7c90f1 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 e7c90f1 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 a03490e Merge: 33c0a67 b4ce488 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 b4ce488 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 33c0a67 Merge: 58a9125 4058f07 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 58a9125 Merge: 3c03f96 e43a6a7 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 e43a6a7 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 4058f07 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 5dfab5b 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 3c03f96 Merge: 5735cb4 2d53e26 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 2d53e26 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 5735cb4 Merge: 18baf3e bb2c1f5 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 bb2c1f5 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
1 parent d65944a commit 6ac5c08

File tree

13,039 files changed

+2024722
-743922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

13,039 files changed

+2024722
-743922
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ language: generic
88

99
install:
1010
- mkdir -p $HOME/goroot
11-
- curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar -xz --strip-components=1 -C $HOME/goroot
11+
- curl -L https://storage.googleapis.com/golang/go1.14.1.linux-amd64.tar.gz | tar -xz --strip-components=1 -C $HOME/goroot
1212
- export GOROOT=$HOME/goroot
1313
- export GOPATH=$HOME/gopath
1414
- export PATH=$GOROOT/bin:$GOPATH/bin:$PATH

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM golang:1.11 as build
1+
FROM golang:1.14 as build
22
WORKDIR $GOPATH/src/github.com/logicmonitor/k8s-argus
33
ARG VERSION
44
COPY ./ ./
55
RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /argus -ldflags "-X \"github.com/logicmonitor/k8s-argus/pkg/constants.Version=${VERSION}\""
66

7-
FROM golang:1.11 as test
7+
FROM golang:1.14 as test
88
WORKDIR $GOPATH/src/github.com/logicmonitor/k8s-argus
99
RUN go get -u github.com/alecthomas/gometalinter
1010
RUN gometalinter --install

0 commit comments

Comments
 (0)