This repository has been archived by the owner on Jan 16, 2023. It is now read-only.
Adding support for k8s 1.16+ #32
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
October 15, 2018 11:14
…95-support-specifying-an-escalation to DEV-39795-support-specifying-an-escalation-dev * commit '4dd2b5c6f8835cb606db54e9d8a8cbef0730479e': DEV-39795: Support specifying an escalation chain for collectors - Argus part update maintainer
…95-support-specifying-an-escalation-dev to develop * commit 'b6a482caf04f476ae23791b7e4b2d2c60eea2717': DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part update maintainer
…19-add-new-configuration-support-in to develop * commit '28e486efd72614fc411777ec84f66d872c6589e4': DEV-40319: Add new configuration support in helm chart DEV-40319: Add new configuration support in helm chart
…12-unify-the-collector-group-name to develop * commit '72776ec8ea3e6dadc92882575bf4fffe9e1835a4': DEV-40512: Unify the collector group name standard based on user input
…DEV-40654-different-cluster-use-same-collector to develop * commit '5ba78962c65c7c22365412e56748dd30398189f9': DEV-40654: different cluster use same collector
…tarting argus and collectorset.
…DEV-40799-argus-two-collectors-can-not-work to develop * commit 'da4d5492dc97f57ab572a2af42eafb30120d2ab2': DEV-40799: two collectors can not work in two k8s slave nodes after starting argus and collectorset.
…successfully but not others.
…successfully but not others.
…successfully but not others.
…DEV-40746-argus-not-existing-escalation-chain to develop * commit '36fa2bd9280738fb88df525f1d955ef39c5ef23b': DEV-40746: not existing escalation chain will create collector group successfully but not others. DEV-40746: not existing escalation chain will create collector group successfully but not others. DEV-40746: not existing escalation chain will create collector group successfully but not others.
…successfully but not others.
…successfully but not others.
…DEV-40746-argus-not-existing-escalation-chain to develop * commit '5e727e78ee4589ef43e71fd3b255942575e64c5a': DEV-40746: not existing escalation chain will create collector group successfully but not others. DEV-40746: not existing escalation chain will create collector group successfully but not others.
…70-make-the-collector-group-name-s to develop * commit '6c0ae6361f64f155d219c326c5eeaee46e4e46e5': DEV-41170: Make the collector group name's casing the same as user defined
…170-make-the-collector-group-name-s to develop * commit 'ee15068ece0af8ca81a425c2771016e679b97ef3': DEV-41170: Make the collector group name's casing the same as user defined
…170-make-the-collector-group-name-s to develop * commit 'fb941dcad8cd23c2fd42dd0f0ad63f49bedd987c': DEV-41170: Make the collector group name's casing the same as user defined
…692-support-proxy-for-dockerized-collector to develop * commit '7ba83d604df51c5e23f83c423a823d990cc7d34c': DEV-52692 Support proxy for dockerized collector DEV-52044 Improve the proxy url configuration DEV-52044 Improve the proxy url configuration DEV-52044 Improve the proxy url configuration DEV-52044 Fix the comments DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-51952 Research http proxy configuration options
…516-create-pr-for-supporting-http-proxy to develop * commit '8a27e0d628747676b1a454083421545a4b39e674': DEV-52692 Support proxy for dockerized collector
…rset-controller into DEV-53516-create-pr-for-supporting-http-proxy # Conflicts: # pkg/controller/collectorset.go # pkg/controller/logicmonitor.go
…767-make-collector-image-repo-configurable to develop * commit 'c83a85daad2b39d724c84f65f341278d511c9d84': DEV-51767 Make collector image + repo configurable DEV-51767 Make collector image + repo configurable DEV 51767 Make collector image + repo configurable
14.0 as well as gosdk to 1.14 Updated vendor folder accordingly
…e/DEV-55374-update-k8s-sdk-1.17-client-go-14.0-library-and-golang-image-1.14-for to feature/upgrade * commit '6c536692aad5590bcf49d65d3a9cb159252d5c74': changed golang version from 1.8.3 to 1.14.1 in .travis.yml file
…e/upgrade to develop * commit '6d80b318f5d86f0ea252951e2a9204433be6e5dd': changed golang version from 1.8.3 to 1.14.1 in .travis.yml file feature/upgrade: updated k8s libs to release 1.17 and client-go lib to 14.0 as well as gosdk to 1.14 Updated vendor folder accordingly
commit 11014e0 Merge: 42d7965 6d80b31 Author: Vaibhav Kumbhar <vaibhav.kumbhar@logicmonitor.com> Date: Tue Apr 14 03:17:15 2020 -0700 Merge pull request #33 in DEV/k8s-collectorset-controller from feature/upgrade to develop * commit '6d80b318f5d86f0ea252951e2a9204433be6e5dd': changed golang version from 1.8.3 to 1.14.1 in .travis.yml file feature/upgrade: updated k8s libs to release 1.17 and client-go lib to 14.0 as well as gosdk to 1.14 Updated vendor folder accordingly commit 6d80b31 Merge: 0b597c0 6c53669 Author: Pranay Lonkar <pranay.lonkar@logicmonitor.com> Date: Mon Apr 6 05:20:18 2020 -0700 Merge pull request #32 in DEV/k8s-collectorset-controller from feature/DEV-55374-update-k8s-sdk-1.17-client-go-14.0-library-and-golang-image-1.14-for to feature/upgrade * commit '6c536692aad5590bcf49d65d3a9cb159252d5c74': changed golang version from 1.8.3 to 1.14.1 in .travis.yml file commit 6c53669 Author: Pranay Lonkar <pranay.lonkar@logicmonitor.com> Date: Mon Mar 30 17:50:30 2020 +0530 changed golang version from 1.8.3 to 1.14.1 in .travis.yml file commit 0b597c0 Author: vaibhav.kumbhar <vaibhav.kumbhar@logicmonitor.com> Date: Mon Mar 9 14:24:02 2020 +0530 feature/upgrade: updated k8s libs to release 1.17 and client-go lib to 14.0 as well as gosdk to 1.14 Updated vendor folder accordingly commit 42d7965 Merge: 5391890 c83a85d Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Wed Sep 4 17:57:34 2019 -0700 Merge pull request #31 in DEV/k8s-collectorset-controller from DEV-51767-make-collector-image-repo-configurable to develop * commit 'c83a85daad2b39d724c84f65f341278d511c9d84': DEV-51767 Make collector image + repo configurable DEV-51767 Make collector image + repo configurable DEV 51767 Make collector image + repo configurable commit c83a85d Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Wed Sep 4 15:10:30 2019 +0800 DEV-51767 Make collector image + repo configurable commit b36558d Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Mon Sep 2 17:04:46 2019 +0800 DEV-51767 Make collector image + repo configurable commit c6b2324 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Mon Sep 2 17:01:54 2019 +0800 DEV 51767 Make collector image + repo configurable commit 5391890 Merge: 6591efe b8140cd Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Mon Jul 29 19:27:47 2019 -0700 Merge pull request #30 in DEV/k8s-collectorset-controller from DEV-53516-create-pr-for-supporting-http-proxy to develop * commit 'b8140cda65e1c8bec81692e7549e2f94625f1455': Develop (#24) Develop (#23) Develop (#22) Develop (#21) commit b8140cd Merge: 11e39f7 0a719d2 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Mon Jul 29 15:52:51 2019 +0800 Merge branch 'master' of https://github.com/logicmonitor/k8s-collectorset-controller into DEV-53516-create-pr-for-supporting-http-proxy # Conflicts: # pkg/controller/collectorset.go # pkg/controller/logicmonitor.go commit 11e39f7 Merge: 6591efe 8297d59 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Mon Jul 29 15:49:08 2019 +0800 Support http proxy commit 6591efe Merge: 789fad0 8a27e0d Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Sun Jul 28 22:50:11 2019 -0700 Merge pull request #29 in DEV/k8s-collectorset-controller from DEV-53516-create-pr-for-supporting-http-proxy to develop * commit '8a27e0d628747676b1a454083421545a4b39e674': DEV-52692 Support proxy for dockerized collector commit 8a27e0d Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Mon Jul 29 10:55:14 2019 +0800 DEV-52692 Support proxy for dockerized collector commit 789fad0 Merge: 8885d10 7ba83d6 Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Tue Jul 23 17:57:41 2019 -0700 Merge pull request #28 in DEV/k8s-collectorset-controller from DEV-52692-support-proxy-for-dockerized-collector to develop * commit '7ba83d604df51c5e23f83c423a823d990cc7d34c': DEV-52692 Support proxy for dockerized collector DEV-52044 Improve the proxy url configuration DEV-52044 Improve the proxy url configuration DEV-52044 Improve the proxy url configuration DEV-52044 Fix the comments DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-52044 Add http proxy for collectorset-controller DEV-51952 Research http proxy configuration options commit 7ba83d6 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Fri Jul 19 16:00:25 2019 +0800 DEV-52692 Support proxy for dockerized collector commit 0cc80c7 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Sat Jun 22 03:43:00 2019 +0800 DEV-52044 Improve the proxy url configuration commit 5efb30b Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Sat Jun 22 03:35:37 2019 +0800 DEV-52044 Improve the proxy url configuration commit e93aaab Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Sat Jun 22 01:40:46 2019 +0800 DEV-52044 Improve the proxy url configuration commit c8c4204 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Fri Jun 21 15:55:05 2019 +0800 DEV-52044 Fix the comments commit 51bda2b Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu Jun 20 13:20:43 2019 +0800 DEV-52044 Add http proxy for collectorset-controller commit c8c8fa4 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu Jun 20 01:04:44 2019 +0800 DEV-52044 Add http proxy for collectorset-controller commit 5dabf63 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu Jun 20 00:39:43 2019 +0800 DEV-52044 Add http proxy for collectorset-controller commit 94805ba Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Wed Jun 19 14:00:15 2019 +0800 DEV-52044 Add http proxy for collectorset-controller commit ef5c2a0 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Wed Jun 19 09:19:35 2019 +0800 DEV-52044 Add http proxy for collectorset-controller commit 1e1443e Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu Jun 13 17:45:42 2019 +0800 DEV-51952 Research http proxy configuration options commit 8885d10 Merge: 0476907 ec53b77 Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Thu May 16 21:09:57 2019 -0700 Merge pull request #25 in DEV/k8s-collectorset-controller from DEV-51677-create-github-pr-for-argus-and to develop * commit 'ec53b77f845cb49538a643af1d74ecc081172c72': DEV-51677 Improve the code according to github comments commit ec53b77 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu May 16 13:33:06 2019 +0800 DEV-51677 Improve the code according to github comments commit 0476907 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Wed May 15 18:38:39 2019 +0800 Modify the format by Travis CI check commit 25a3d77 Merge: 6e7b36a 512e9a2 Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Mon May 13 00:09:30 2019 -0700 Merge pull request #24 in DEV/k8s-collectorset-controller from DEV-49251-improve-panic-log-process to develop * commit '512e9a20388a1e21a8c71cb004ebbbae190c3e16': DEV-49251 Improve the comments commit 512e9a2 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Mon May 13 14:45:39 2019 +0800 DEV-49251 Improve the comments commit 6e7b36a Merge: 98bb5e7 9e73942 Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Sun May 12 02:45:21 2019 -0700 Merge pull request #23 in DEV/k8s-collectorset-controller from DEV-50734-devts-6790-discover-nodeport-and to develop * commit '9e73942c0a60ad046bb7acde942a565d43e2c63a': DEV-50734 Improve the log commit 98bb5e7 Merge: c0e9b46 71b9a4e Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Sun May 12 02:44:19 2019 -0700 Merge pull request #22 in DEV/k8s-collectorset-controller from DEV-49251-improve-panic-log-process to develop * commit '71b9a4e5d7342b8b748e0a3fda8396884a0daae3': DEV-49251 Improve the log and comments commit c0e9b46 Merge: 16713e8 d359c42 Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Sat May 11 01:55:43 2019 -0700 Merge pull request #21 in DEV/k8s-collectorset-controller from DEV-50494-add-argus-related-identity-for to develop * commit 'd359c427bda045dcaadd62048a847cecd356fa03': DEV-50494 Improve the custom properties name commit 71b9a4e Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Sat May 11 16:35:56 2019 +0800 DEV-49251 Improve the log and comments commit 9e73942 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Sat May 11 15:07:00 2019 +0800 DEV-50734 Improve the log commit d359c42 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Fri May 10 15:38:21 2019 +0800 DEV-50494 Improve the custom properties name commit 16713e8 Merge: 3e98331 61bce4d Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Tue May 7 07:12:42 2019 -0700 Merge pull request #17 in DEV/k8s-collectorset-controller from DEV-49251-improve-panic-log-process to develop * commit '61bce4dcff99d60e4b5a88a79fc8509a1aa2c40e': DEV-49251 Improve panic error DEV-49251 improve panic error DEV-49251 add unit test DEV-49251 add panic error handle logic, print the error log commit 3e98331 Merge: 47923af 14f2fb3 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue May 7 03:11:45 2019 -0700 Merge pull request #20 in DEV/k8s-collectorset-controller from DEV-41301-upgrade-the-go-sdk-to-v2 to develop * commit '14f2fb3e52bd3768c5ba3c83d5a036cd1faabba9': DEV-41301 Upgrade the go sdk to v2 commit 14f2fb3 Author: JeremyCD <jeremy.tang@logicmonitor.com> Date: Tue May 7 18:10:51 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit 47923af Merge: 766818e 4973934 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue May 7 02:47:51 2019 -0700 Merge pull request #19 in DEV/k8s-collectorset-controller from DEV-41301-upgrade-the-go-sdk-to-v2 to develop * commit '49739345ab94f6c00732dc762e25b75a7000772b': DEV-41301 Upgrade the go sdk to v2 DEV 49511 allow user to custom the collector group (#20) DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring DEV-39795: Support specifying an escalation chain for collectors - Argus part Dev 48974 upgrade golang 1.9 to 1.11 (#19) DEV-48974 Upgrade Argus from golang 1.9 to 1.11 DEV-48974 Upgrade Argus from golang 1.9 to 1.11 Develop (#18) Dev 42060 improve the branch of the lm sdk (#17) Develop (#16) don't shadow restResponse ugh. lint. lint fixes Develop (#15) bump version Dev-40217 support to set log levels and improve (#14) Stash to GitHub (#13) Develop (#9) bump version (#12) use latest tag for collector image commit 766818e Merge: 14e920a a8aaba0 Author: Daizhong Xiao <daizhong.xiao@logicmonitor.com> Date: Tue May 7 02:42:11 2019 -0700 Merge pull request #18 in DEV/k8s-collectorset-controller from DEV-50734-devts-6790-discover-nodeport-and to develop * commit 'a8aaba0c6c73b686c0cc4e618e8b014474289438': DEV-50734 Improve collector size conversion to lowercase DEV-50734 Case insensitive commit 61bce4d Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Tue May 7 17:16:33 2019 +0800 DEV-49251 Improve panic error commit 4973934 Author: JeremyCD <jeremy.tang@logicmonitor.com> Date: Mon May 6 10:52:29 2019 +0800 DEV-41301 Upgrade the go sdk to v2 commit 745bcb0 Merge: ad72b85 1a5851c Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Mon May 6 10:04:23 2019 +0800 Merge pull request #6 from logicmonitor/develop Develop commit a8aaba0 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Sun Apr 28 18:46:29 2019 +0800 DEV-50734 Improve collector size conversion to lowercase commit e8fa0cc Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Fri Apr 26 23:10:48 2019 +0800 DEV-50734 Case insensitive commit 72c2164 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Fri Apr 26 22:04:28 2019 +0800 DEV-49251 improve panic error commit 50fd10f Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu Apr 25 18:54:40 2019 +0800 DEV-49251 add unit test commit b26fd61 Author: dzxiao <daizhong.xiao@logicmonitor.com> Date: Thu Apr 25 18:53:26 2019 +0800 DEV-49251 add panic error handle logic, print the error log commit ad72b85 Merge: d993367 24f5022 Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Wed Mar 20 10:24:10 2019 +0800 Merge pull request #5 from JeremyTangCD/DEV-49511-collectorset-controller-allow-user Dev 49511 allow user to custom the collector group commit 24f5022 Merge: cb833a8 d993367 Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Wed Mar 20 10:23:34 2019 +0800 Merge branch 'develop' into DEV-49511-collectorset-controller-allow-user commit cb833a8 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Mar 20 10:21:43 2019 +0800 DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring commit 4e605f2 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Mar 20 10:20:32 2019 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part commit 14e920a Merge: ef6197c d0aa2fb Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Wed Mar 6 18:33:05 2019 -0800 Merge pull request #16 in DEV/k8s-collectorset-controller from DEV-49511-collectorset-controller-allow-user to develop * commit 'd0aa2fbb26f4606bd01a07119355eea7fe851939': DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring commit d0aa2fb Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Mar 4 17:50:22 2019 +0800 DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring commit 639d3b5 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Mar 4 17:49:40 2019 +0800 DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring commit d993367 Merge: dab1b1f 454e29e Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Thu Feb 28 14:33:07 2019 +0800 Merge pull request #4 from JeremyTangCD/DEV-48974-upgrade-argus-from-golang-1.9-to Dev 48974 upgrade argus from golang 1.9 to commit 454e29e Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Feb 28 14:25:22 2019 +0800 DEV-48974 Upgrade Argus from golang 1.9 to 1.11 commit 2218160 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Feb 28 14:14:28 2019 +0800 DEV-48974 Upgrade Argus from golang 1.9 to 1.11 commit dab1b1f Merge: d8202ac 5acbc20 Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Thu Feb 28 13:46:17 2019 +0800 Merge branch 'develop' into develop commit d8202ac Merge: fe9cd9e 1b25f87 Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Thu Feb 28 13:42:46 2019 +0800 Merge pull request #3 from JeremyTangCD/DEV-48974-upgrade-argus-from-golang-1.9-to Dev 48974 upgrade golang 1.9 to 1.11 commit ef6197c Merge: e769a75 1b25f87 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Wed Feb 20 23:06:52 2019 -0800 Merge pull request #15 in DEV/k8s-collectorset-controller from DEV-48974-upgrade-argus-from-golang-1.9-to to develop * commit '1b25f8752927f2371f9b0b42b871c551ca0c221e': DEV-48974 Upgrade Argus from golang 1.9 to 1.11 commit e769a75 Merge: 14fad08 26cbd48 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Wed Feb 20 23:06:20 2019 -0800 Merge pull request #14 in DEV/k8s-collectorset-controller from bugfix/DEV-48885-collectorset-controller-doesn-t to develop * commit '26cbd48068f3b97438ac00f244ae34b0b9fa8e31': DEV-48885 collectorset controller doesn't update failover collectors when increasing replica count commit 1b25f87 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Feb 18 15:27:40 2019 +0800 DEV-48974 Upgrade Argus from golang 1.9 to 1.11 commit 26cbd48 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Feb 18 13:33:38 2019 +0800 DEV-48885 collectorset controller doesn't update failover collectors when increasing replica count commit 14fad08 Merge: c9e38f1 8f4b61d Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Mon Jan 14 17:38:19 2019 -0800 Merge pull request #13 in DEV/k8s-collectorset-controller from DEV-42060-don-t-create-collector-device-for to develop * commit '8f4b61dd5dda4a3921788f9b41ebc118430539d1': DEV-42060: Don't create collector device for Kubernetes Clusters commit 8f4b61d Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Jan 14 11:39:23 2019 +0800 DEV-42060: Don't create collector device for Kubernetes Clusters commit fe9cd9e Merge: ad789f0 0fb8cbf Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Wed Jan 2 16:27:38 2019 +0800 Merge branch 'develop' into develop commit ad789f0 Merge: 47e31ff c9e38f1 Author: JeremyTangCD <44150592+JeremyTangCD@users.noreply.github.com> Date: Wed Jan 2 16:25:06 2019 +0800 Merge pull request #2 from JeremyTangCD/DEV-40217-support-to-set-log-levels-and-improve Dev-40217 support to set log levels and improve commit c9e38f1 Merge: 61cf45e 8d9a694 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Dec 25 23:38:42 2018 -0800 Merge pull request #12 in DEV/k8s-collectorset-controller from DEV-40217-support-to-set-log-levels-and-improve to develop * commit '8d9a694d9524b9a7d28943b2e8e3700d43e6490a': 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-40217: Support to set log levels and improve logs in argus related projects commit 47e31ff Merge: 61cf45e 63a2871 Author: Jeff <woz5999@gmail.com> Date: Thu Dec 20 16:40:11 2018 -0600 Merge branch 'master' into develop commit 8d9a694 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Dec 20 21:10:04 2018 +0800 DEV-40217: Support to set log levels and improve logs in argus related projects commit 91522a9 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Dec 19 15:39:35 2018 +0800 DEV-40217: Support to set log levels and improve logs in argus related projects commit 5f451a7 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Tue Dec 18 17:21:13 2018 +0800 DEV-40217: Support to set log levels and improve logs in argus related projects commit 61cf45e Merge: eb70da2 fb941dc Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Dec 11 22:03:16 2018 -0800 Merge pull request #11 in DEV/k8s-collectorset-controller from DEV-41170-make-the-collector-group-name-s to develop * commit 'fb941dcad8cd23c2fd42dd0f0ad63f49bedd987c': DEV-41170: Make the collector group name's casing the same as user defined commit fb941dc Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Dec 12 14:02:26 2018 +0800 DEV-41170: Make the collector group name's casing the same as user defined commit eb70da2 Merge: fe4cab4 ee15068 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Dec 11 21:51:19 2018 -0800 Merge pull request #10 in DEV/k8s-collectorset-controller from DEV-41170-make-the-collector-group-name-s to develop * commit 'ee15068ece0af8ca81a425c2771016e679b97ef3': DEV-41170: Make the collector group name's casing the same as user defined commit ee15068 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Dec 12 13:46:03 2018 +0800 DEV-41170: Make the collector group name's casing the same as user defined commit fe4cab4 Merge: 8e11161 6c0ae63 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Dec 11 18:26:10 2018 -0800 Merge pull request #9 in DEV/k8s-collectorset-controller from DEV-41170-make-the-collector-group-name-s to develop * commit '6c0ae6361f64f155d219c326c5eeaee46e4e46e5': DEV-41170: Make the collector group name's casing the same as user defined commit 6c0ae63 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Dec 10 15:12:23 2018 +0800 DEV-41170: Make the collector group name's casing the same as user defined commit 8e11161 Merge: dce8d2c 5e727e7 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Fri Nov 16 19:20:31 2018 -0800 Merge pull request #8 in DEV/k8s-collectorset-controller from bugfix/DEV-40746-argus-not-existing-escalation-chain to develop * commit '5e727e78ee4589ef43e71fd3b255942575e64c5a': DEV-40746: not existing escalation chain will create collector group successfully but not others. DEV-40746: not existing escalation chain will create collector group successfully but not others. commit 5e727e7 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Sat Nov 17 11:10:39 2018 +0800 DEV-40746: not existing escalation chain will create collector group successfully but not others. commit f24149f Author: jeremy <jeremy.tang@logicmonitor.com> Date: Fri Nov 16 15:36:19 2018 +0800 DEV-40746: not existing escalation chain will create collector group successfully but not others. commit dce8d2c Merge: b3d1245 36fa2bd Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Thu Nov 15 17:15:29 2018 -0800 Merge pull request #7 in DEV/k8s-collectorset-controller from bugfix/DEV-40746-argus-not-existing-escalation-chain to develop * commit '36fa2bd9280738fb88df525f1d955ef39c5ef23b': DEV-40746: not existing escalation chain will create collector group successfully but not others. DEV-40746: not existing escalation chain will create collector group successfully but not others. DEV-40746: not existing escalation chain will create collector group successfully but not others. commit 36fa2bd Author: jeremy <jeremy.tang@logicmonitor.com> Date: Fri Nov 16 09:14:36 2018 +0800 DEV-40746: not existing escalation chain will create collector group successfully but not others. commit 30570c1 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Nov 15 09:57:28 2018 +0800 DEV-40746: not existing escalation chain will create collector group successfully but not others. commit a7c86f9 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Nov 14 21:27:12 2018 +0800 DEV-40746: not existing escalation chain will create collector group successfully but not others. commit b3d1245 Merge: ec99ceb da4d549 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Nov 13 21:25:26 2018 -0800 Merge pull request #6 in DEV/k8s-collectorset-controller from bugfix/DEV-40799-argus-two-collectors-can-not-work to develop * commit 'da4d5492dc97f57ab572a2af42eafb30120d2ab2': DEV-40799: two collectors can not work in two k8s slave nodes after starting argus and collectorset. commit da4d549 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Nov 14 09:57:44 2018 +0800 DEV-40799: two collectors can not work in two k8s slave nodes after starting argus and collectorset. commit ec99ceb Merge: 7de3b0b 5ba7896 Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Wed Nov 7 21:58:48 2018 -0800 Merge pull request #5 in DEV/k8s-collectorset-controller from bugfix/DEV-40654-different-cluster-use-same-collector to develop * commit '5ba78962c65c7c22365412e56748dd30398189f9': DEV-40654: different cluster use same collector commit 5ba7896 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Nov 7 14:40:10 2018 +0800 DEV-40654: different cluster use same collector commit 7de3b0b Merge: 83202cd 72776ec Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Nov 6 00:38:37 2018 -0800 Merge pull request #4 in DEV/k8s-collectorset-controller from DEV-40512-unify-the-collector-group-name to develop * commit '72776ec8ea3e6dadc92882575bf4fffe9e1835a4': DEV-40512: Unify the collector group name standard based on user input commit 72776ec Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Nov 1 17:05:30 2018 +0800 DEV-40512: Unify the collector group name standard based on user input commit 83202cd Merge: a90bd9b 28e486e Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Tue Oct 23 22:34:16 2018 -0700 Merge pull request #3 in DEV/k8s-collectorset-controller from DEV-40319-add-new-configuration-support-in to develop * commit '28e486efd72614fc411777ec84f66d872c6589e4': DEV-40319: Add new configuration support in helm chart DEV-40319: Add new configuration support in helm chart commit 28e486e Author: jeremy <jeremy.tang@logicmonitor.com> Date: Wed Oct 24 11:26:26 2018 +0800 DEV-40319: Add new configuration support in helm chart commit 489e484 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Tue Oct 23 21:01:42 2018 +0800 DEV-40319: Add new configuration support in helm chart commit a90bd9b Merge: 8d89d4a b6a482c Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Wed Oct 17 23:53:45 2018 -0700 Merge pull request #2 in DEV/k8s-collectorset-controller from DEV-39795-support-specifying-an-escalation-dev to develop * commit 'b6a482caf04f476ae23791b7e4b2d2c60eea2717': DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part DEV-39795: Support specifying an escalation chain for collectors - Argus part update maintainer commit b6a482c Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Oct 18 14:02:50 2018 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part commit ac4c1e3 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Thu Oct 18 10:01:12 2018 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part commit c9b7666 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Tue Oct 16 18:02:13 2018 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part commit 5474619 Author: jeremy <jeremy.tang@logicmonitor.com> Date: Tue Oct 16 17:56:19 2018 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part commit baae17e Author: jeremy <jeremy.tang@logicmonitor.com> Date: Tue Oct 16 10:41:42 2018 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part commit badfd5d Merge: 8d89d4a 4dd2b5c Author: Jeremy Tang <jeremy.tang@logicmonitor.com> Date: Sun Oct 14 23:19:28 2018 -0700 Merge pull request #1 in DEV/k8s-collectorset-controller from DEV-39795-support-specifying-an-escalation to DEV-39795-support-specifying-an-escalation-dev * commit '4dd2b5c6f8835cb606db54e9d8a8cbef0730479e': DEV-39795: Support specifying an escalation chain for collectors - Argus part update maintainer commit 4dd2b5c Author: jeremy <jeremy.tang@logicmonitor.com> Date: Mon Oct 15 11:14:42 2018 +0800 DEV-39795: Support specifying an escalation chain for collectors - Argus part
…757-update-csc-image-tag-v2latest to develop * commit 'a715f1bf7478de25a9d532f8cb36fa212cc9cae0': DEV-58757: synced lm sdk go package with the v2 DEV-58757: updated image tag to v2latest
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Squashed commit of the following:
commit 11014e0
Merge: 42d7965 6d80b31
Author: Vaibhav Kumbhar vaibhav.kumbhar@logicmonitor.com
Date: Tue Apr 14 03:17:15 2020 -0700
Merge pull request #33 in DEV/k8s-collectorset-controller from feature/upgrade to develop
changed golang version from 1.8.3 to 1.14.1 in .travis.yml file
feature/upgrade: updated k8s libs to release 1.17 and client-go lib to 14.0 as well as gosdk to 1.14 Updated vendor folder accordingly
commit 6d80b31
Merge: 0b597c0 6c53669
Author: Pranay Lonkar pranay.lonkar@logicmonitor.com
Date: Mon Apr 6 05:20:18 2020 -0700
Merge pull request #32 in DEV/k8s-collectorset-controller from feature/DEV-55374-update-k8s-sdk-1.17-client-go-14.0-library-and-golang-image-1.14-for to feature/upgrade
changed golang version from 1.8.3 to 1.14.1 in .travis.yml file
commit 6c53669
Author: Pranay Lonkar pranay.lonkar@logicmonitor.com
Date: Mon Mar 30 17:50:30 2020 +0530
changed golang version from 1.8.3 to 1.14.1 in .travis.yml file
commit 0b597c0
Author: vaibhav.kumbhar vaibhav.kumbhar@logicmonitor.com
Date: Mon Mar 9 14:24:02 2020 +0530
feature/upgrade: updated k8s libs to release 1.17 and client-go lib to
14.0 as well as gosdk to 1.14
Updated vendor folder accordingly
commit 42d7965
Merge: 5391890 c83a85d
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Wed Sep 4 17:57:34 2019 -0700
Merge pull request #31 in DEV/k8s-collectorset-controller from DEV-51767-make-collector-image-repo-configurable to develop
DEV-51767 Make collector image + repo configurable
DEV-51767 Make collector image + repo configurable
DEV 51767 Make collector image + repo configurable
commit c83a85d
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Wed Sep 4 15:10:30 2019 +0800
DEV-51767 Make collector image + repo configurable
commit b36558d
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Mon Sep 2 17:04:46 2019 +0800
DEV-51767 Make collector image + repo configurable
commit c6b2324
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Mon Sep 2 17:01:54 2019 +0800
DEV 51767 Make collector image + repo configurable
commit 5391890
Merge: 6591efe b8140cd
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Mon Jul 29 19:27:47 2019 -0700
Merge pull request #30 in DEV/k8s-collectorset-controller from DEV-53516-create-pr-for-supporting-http-proxy to develop
Develop (Develop #24)
Develop (Develop #23)
Develop (Develop #22)
Develop (Develop #21)
commit b8140cd
Merge: 11e39f7 0a719d2
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Mon Jul 29 15:52:51 2019 +0800
Merge branch 'master' of https://github.com/logicmonitor/k8s-collectorset-controller into DEV-53516-create-pr-for-supporting-http-proxy
Conflicts:
pkg/controller/collectorset.go
pkg/controller/logicmonitor.go
commit 11e39f7
Merge: 6591efe 8297d59
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Mon Jul 29 15:49:08 2019 +0800
Support http proxy
commit 6591efe
Merge: 789fad0 8a27e0d
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Sun Jul 28 22:50:11 2019 -0700
Merge pull request #29 in DEV/k8s-collectorset-controller from DEV-53516-create-pr-for-supporting-http-proxy to develop
DEV-52692 Support proxy for dockerized collector
commit 8a27e0d
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Mon Jul 29 10:55:14 2019 +0800
DEV-52692 Support proxy for dockerized collector
commit 789fad0
Merge: 8885d10 7ba83d6
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Tue Jul 23 17:57:41 2019 -0700
Merge pull request #28 in DEV/k8s-collectorset-controller from DEV-52692-support-proxy-for-dockerized-collector to develop
DEV-52692 Support proxy for dockerized collector
DEV-52044 Improve the proxy url configuration
DEV-52044 Improve the proxy url configuration
DEV-52044 Improve the proxy url configuration
DEV-52044 Fix the comments
DEV-52044 Add http proxy for collectorset-controller
DEV-52044 Add http proxy for collectorset-controller
DEV-52044 Add http proxy for collectorset-controller
DEV-52044 Add http proxy for collectorset-controller
DEV-52044 Add http proxy for collectorset-controller
DEV-51952 Research http proxy configuration options
commit 7ba83d6
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Fri Jul 19 16:00:25 2019 +0800
DEV-52692 Support proxy for dockerized collector
commit 0cc80c7
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Sat Jun 22 03:43:00 2019 +0800
DEV-52044 Improve the proxy url configuration
commit 5efb30b
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Sat Jun 22 03:35:37 2019 +0800
DEV-52044 Improve the proxy url configuration
commit e93aaab
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Sat Jun 22 01:40:46 2019 +0800
DEV-52044 Improve the proxy url configuration
commit c8c4204
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Fri Jun 21 15:55:05 2019 +0800
DEV-52044 Fix the comments
commit 51bda2b
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu Jun 20 13:20:43 2019 +0800
DEV-52044 Add http proxy for collectorset-controller
commit c8c8fa4
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu Jun 20 01:04:44 2019 +0800
DEV-52044 Add http proxy for collectorset-controller
commit 5dabf63
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu Jun 20 00:39:43 2019 +0800
DEV-52044 Add http proxy for collectorset-controller
commit 94805ba
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Wed Jun 19 14:00:15 2019 +0800
DEV-52044 Add http proxy for collectorset-controller
commit ef5c2a0
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Wed Jun 19 09:19:35 2019 +0800
DEV-52044 Add http proxy for collectorset-controller
commit 1e1443e
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu Jun 13 17:45:42 2019 +0800
DEV-51952 Research http proxy configuration options
commit 8885d10
Merge: 0476907 ec53b77
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Thu May 16 21:09:57 2019 -0700
Merge pull request #25 in DEV/k8s-collectorset-controller from DEV-51677-create-github-pr-for-argus-and to develop
DEV-51677 Improve the code according to github comments
commit ec53b77
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu May 16 13:33:06 2019 +0800
DEV-51677 Improve the code according to github comments
commit 0476907
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Wed May 15 18:38:39 2019 +0800
Modify the format by Travis CI check
commit 25a3d77
Merge: 6e7b36a 512e9a2
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Mon May 13 00:09:30 2019 -0700
Merge pull request #24 in DEV/k8s-collectorset-controller from DEV-49251-improve-panic-log-process to develop
DEV-49251 Improve the comments
commit 512e9a2
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Mon May 13 14:45:39 2019 +0800
DEV-49251 Improve the comments
commit 6e7b36a
Merge: 98bb5e7 9e73942
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Sun May 12 02:45:21 2019 -0700
Merge pull request #23 in DEV/k8s-collectorset-controller from DEV-50734-devts-6790-discover-nodeport-and to develop
DEV-50734 Improve the log
commit 98bb5e7
Merge: c0e9b46 71b9a4e
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Sun May 12 02:44:19 2019 -0700
Merge pull request #22 in DEV/k8s-collectorset-controller from DEV-49251-improve-panic-log-process to develop
DEV-49251 Improve the log and comments
commit c0e9b46
Merge: 16713e8 d359c42
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Sat May 11 01:55:43 2019 -0700
Merge pull request #21 in DEV/k8s-collectorset-controller from DEV-50494-add-argus-related-identity-for to develop
DEV-50494 Improve the custom properties name
commit 71b9a4e
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Sat May 11 16:35:56 2019 +0800
DEV-49251 Improve the log and comments
commit 9e73942
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Sat May 11 15:07:00 2019 +0800
DEV-50734 Improve the log
commit d359c42
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Fri May 10 15:38:21 2019 +0800
DEV-50494 Improve the custom properties name
commit 16713e8
Merge: 3e98331 61bce4d
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Tue May 7 07:12:42 2019 -0700
Merge pull request #17 in DEV/k8s-collectorset-controller from DEV-49251-improve-panic-log-process to develop
DEV-49251 Improve panic error
DEV-49251 improve panic error
DEV-49251 add unit test
DEV-49251 add panic error handle logic, print the error log
commit 3e98331
Merge: 47923af 14f2fb3
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue May 7 03:11:45 2019 -0700
Merge pull request #20 in DEV/k8s-collectorset-controller from DEV-41301-upgrade-the-go-sdk-to-v2 to develop
DEV-41301 Upgrade the go sdk to v2
commit 14f2fb3
Author: JeremyCD jeremy.tang@logicmonitor.com
Date: Tue May 7 18:10:51 2019 +0800
DEV-41301 Upgrade the go sdk to v2
commit 47923af
Merge: 766818e 4973934
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue May 7 02:47:51 2019 -0700
Merge pull request #19 in DEV/k8s-collectorset-controller from DEV-41301-upgrade-the-go-sdk-to-v2 to develop
DEV-41301 Upgrade the go sdk to v2
DEV 49511 allow user to custom the collector group (DEV 49511 allow user to custom the collector group #20)
DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
DEV-39795: Support specifying an escalation chain for collectors - Argus part
Dev 48974 upgrade golang 1.9 to 1.11 (Dev 48974 upgrade golang 1.9 to 1.11 #19)
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
Develop (Develop #18)
Dev 42060 improve the branch of the lm sdk (Dev 42060 improve the branch of the lm sdk #17)
Develop (Develop #16)
don't shadow restResponse
ugh. lint.
lint fixes
Develop (Develop #15)
bump version
Dev-40217 support to set log levels and improve (Dev-40217 support to set log levels and improve #14)
Stash to GitHub (Stash to GitHub #13)
Develop (Develop #9)
bump version (bump version #12)
use latest tag for collector image
commit 766818e
Merge: 14e920a a8aaba0
Author: Daizhong Xiao daizhong.xiao@logicmonitor.com
Date: Tue May 7 02:42:11 2019 -0700
Merge pull request #18 in DEV/k8s-collectorset-controller from DEV-50734-devts-6790-discover-nodeport-and to develop
DEV-50734 Improve collector size conversion to lowercase
DEV-50734 Case insensitive
commit 61bce4d
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Tue May 7 17:16:33 2019 +0800
DEV-49251 Improve panic error
commit 4973934
Author: JeremyCD jeremy.tang@logicmonitor.com
Date: Mon May 6 10:52:29 2019 +0800
DEV-41301 Upgrade the go sdk to v2
commit 745bcb0
Merge: ad72b85 1a5851c
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Mon May 6 10:04:23 2019 +0800
Merge pull request #6 from logicmonitor/develop
Develop
commit a8aaba0
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Sun Apr 28 18:46:29 2019 +0800
DEV-50734 Improve collector size conversion to lowercase
commit e8fa0cc
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Fri Apr 26 23:10:48 2019 +0800
DEV-50734 Case insensitive
commit 72c2164
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Fri Apr 26 22:04:28 2019 +0800
DEV-49251 improve panic error
commit 50fd10f
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu Apr 25 18:54:40 2019 +0800
DEV-49251 add unit test
commit b26fd61
Author: dzxiao daizhong.xiao@logicmonitor.com
Date: Thu Apr 25 18:53:26 2019 +0800
DEV-49251 add panic error handle logic, print the error log
commit ad72b85
Merge: d993367 24f5022
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Wed Mar 20 10:24:10 2019 +0800
Merge pull request #5 from JeremyTangCD/DEV-49511-collectorset-controller-allow-user
Dev 49511 allow user to custom the collector group
commit 24f5022
Merge: cb833a8 d993367
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Wed Mar 20 10:23:34 2019 +0800
Merge branch 'develop' into DEV-49511-collectorset-controller-allow-user
commit cb833a8
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Mar 20 10:21:43 2019 +0800
DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
commit 4e605f2
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Mar 20 10:20:32 2019 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part
commit 14e920a
Merge: ef6197c d0aa2fb
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Wed Mar 6 18:33:05 2019 -0800
Merge pull request #16 in DEV/k8s-collectorset-controller from DEV-49511-collectorset-controller-allow-user to develop
DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
commit d0aa2fb
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Mar 4 17:50:22 2019 +0800
DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
commit 639d3b5
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Mar 4 17:49:40 2019 +0800
DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
commit d993367
Merge: dab1b1f 454e29e
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Thu Feb 28 14:33:07 2019 +0800
Merge pull request #4 from JeremyTangCD/DEV-48974-upgrade-argus-from-golang-1.9-to
Dev 48974 upgrade argus from golang 1.9 to
commit 454e29e
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Feb 28 14:25:22 2019 +0800
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
commit 2218160
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Feb 28 14:14:28 2019 +0800
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
commit dab1b1f
Merge: d8202ac 5acbc20
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Thu Feb 28 13:46:17 2019 +0800
Merge branch 'develop' into develop
commit d8202ac
Merge: fe9cd9e 1b25f87
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Thu Feb 28 13:42:46 2019 +0800
Merge pull request #3 from JeremyTangCD/DEV-48974-upgrade-argus-from-golang-1.9-to
Dev 48974 upgrade golang 1.9 to 1.11
commit ef6197c
Merge: e769a75 1b25f87
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Wed Feb 20 23:06:52 2019 -0800
Merge pull request #15 in DEV/k8s-collectorset-controller from DEV-48974-upgrade-argus-from-golang-1.9-to to develop
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
commit e769a75
Merge: 14fad08 26cbd48
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Wed Feb 20 23:06:20 2019 -0800
Merge pull request #14 in DEV/k8s-collectorset-controller from bugfix/DEV-48885-collectorset-controller-doesn-t to develop
DEV-48885 collectorset controller doesn't update failover collectors when increasing replica count
commit 1b25f87
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Feb 18 15:27:40 2019 +0800
DEV-48974 Upgrade Argus from golang 1.9 to 1.11
commit 26cbd48
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Feb 18 13:33:38 2019 +0800
DEV-48885 collectorset controller doesn't update failover collectors when increasing replica count
commit 14fad08
Merge: c9e38f1 8f4b61d
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Mon Jan 14 17:38:19 2019 -0800
Merge pull request #13 in DEV/k8s-collectorset-controller from DEV-42060-don-t-create-collector-device-for to develop
DEV-42060: Don't create collector device for Kubernetes Clusters
commit 8f4b61d
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Jan 14 11:39:23 2019 +0800
DEV-42060: Don't create collector device for Kubernetes Clusters
commit fe9cd9e
Merge: ad789f0 0fb8cbf
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Wed Jan 2 16:27:38 2019 +0800
Merge branch 'develop' into develop
commit ad789f0
Merge: 47e31ff c9e38f1
Author: JeremyTangCD 44150592+JeremyTangCD@users.noreply.github.com
Date: Wed Jan 2 16:25:06 2019 +0800
Merge pull request #2 from JeremyTangCD/DEV-40217-support-to-set-log-levels-and-improve
Dev-40217 support to set log levels and improve
commit c9e38f1
Merge: 61cf45e 8d9a694
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Dec 25 23:38:42 2018 -0800
Merge pull request #12 in DEV/k8s-collectorset-controller from DEV-40217-support-to-set-log-levels-and-improve to develop
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-40217: Support to set log levels and improve logs in argus related projects
commit 47e31ff
Merge: 61cf45e 63a2871
Author: Jeff woz5999@gmail.com
Date: Thu Dec 20 16:40:11 2018 -0600
Merge branch 'master' into develop
commit 8d9a694
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Dec 20 21:10:04 2018 +0800
DEV-40217: Support to set log levels and improve logs in argus related projects
commit 91522a9
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Dec 19 15:39:35 2018 +0800
DEV-40217: Support to set log levels and improve logs in argus related projects
commit 5f451a7
Author: jeremy jeremy.tang@logicmonitor.com
Date: Tue Dec 18 17:21:13 2018 +0800
DEV-40217: Support to set log levels and improve logs in argus related projects
commit 61cf45e
Merge: eb70da2 fb941dc
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Dec 11 22:03:16 2018 -0800
Merge pull request #11 in DEV/k8s-collectorset-controller from DEV-41170-make-the-collector-group-name-s to develop
DEV-41170: Make the collector group name's casing the same as user defined
commit fb941dc
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Dec 12 14:02:26 2018 +0800
DEV-41170: Make the collector group name's casing the same as user defined
commit eb70da2
Merge: fe4cab4 ee15068
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Dec 11 21:51:19 2018 -0800
Merge pull request #10 in DEV/k8s-collectorset-controller from DEV-41170-make-the-collector-group-name-s to develop
DEV-41170: Make the collector group name's casing the same as user defined
commit ee15068
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Dec 12 13:46:03 2018 +0800
DEV-41170: Make the collector group name's casing the same as user defined
commit fe4cab4
Merge: 8e11161 6c0ae63
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Dec 11 18:26:10 2018 -0800
Merge pull request #9 in DEV/k8s-collectorset-controller from DEV-41170-make-the-collector-group-name-s to develop
DEV-41170: Make the collector group name's casing the same as user defined
commit 6c0ae63
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Dec 10 15:12:23 2018 +0800
DEV-41170: Make the collector group name's casing the same as user defined
commit 8e11161
Merge: dce8d2c 5e727e7
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Fri Nov 16 19:20:31 2018 -0800
Merge pull request #8 in DEV/k8s-collectorset-controller from bugfix/DEV-40746-argus-not-existing-escalation-chain to develop
DEV-40746: not existing escalation chain will create collector group successfully but not others.
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit 5e727e7
Author: jeremy jeremy.tang@logicmonitor.com
Date: Sat Nov 17 11:10:39 2018 +0800
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit f24149f
Author: jeremy jeremy.tang@logicmonitor.com
Date: Fri Nov 16 15:36:19 2018 +0800
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit dce8d2c
Merge: b3d1245 36fa2bd
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Thu Nov 15 17:15:29 2018 -0800
Merge pull request #7 in DEV/k8s-collectorset-controller from bugfix/DEV-40746-argus-not-existing-escalation-chain to develop
DEV-40746: not existing escalation chain will create collector group successfully but not others.
DEV-40746: not existing escalation chain will create collector group successfully but not others.
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit 36fa2bd
Author: jeremy jeremy.tang@logicmonitor.com
Date: Fri Nov 16 09:14:36 2018 +0800
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit 30570c1
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Nov 15 09:57:28 2018 +0800
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit a7c86f9
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Nov 14 21:27:12 2018 +0800
DEV-40746: not existing escalation chain will create collector group successfully but not others.
commit b3d1245
Merge: ec99ceb da4d549
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Nov 13 21:25:26 2018 -0800
Merge pull request #6 in DEV/k8s-collectorset-controller from bugfix/DEV-40799-argus-two-collectors-can-not-work to develop
DEV-40799: two collectors can not work in two k8s slave nodes after starting argus and collectorset.
commit da4d549
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Nov 14 09:57:44 2018 +0800
DEV-40799: two collectors can not work in two k8s slave nodes after starting argus and collectorset.
commit ec99ceb
Merge: 7de3b0b 5ba7896
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Wed Nov 7 21:58:48 2018 -0800
Merge pull request #5 in DEV/k8s-collectorset-controller from bugfix/DEV-40654-different-cluster-use-same-collector to develop
DEV-40654: different cluster use same collector
commit 5ba7896
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Nov 7 14:40:10 2018 +0800
DEV-40654: different cluster use same collector
commit 7de3b0b
Merge: 83202cd 72776ec
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Nov 6 00:38:37 2018 -0800
Merge pull request #4 in DEV/k8s-collectorset-controller from DEV-40512-unify-the-collector-group-name to develop
DEV-40512: Unify the collector group name standard based on user input
commit 72776ec
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Nov 1 17:05:30 2018 +0800
DEV-40512: Unify the collector group name standard based on user input
commit 83202cd
Merge: a90bd9b 28e486e
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Tue Oct 23 22:34:16 2018 -0700
Merge pull request #3 in DEV/k8s-collectorset-controller from DEV-40319-add-new-configuration-support-in to develop
DEV-40319: Add new configuration support in helm chart
DEV-40319: Add new configuration support in helm chart
commit 28e486e
Author: jeremy jeremy.tang@logicmonitor.com
Date: Wed Oct 24 11:26:26 2018 +0800
DEV-40319: Add new configuration support in helm chart
commit 489e484
Author: jeremy jeremy.tang@logicmonitor.com
Date: Tue Oct 23 21:01:42 2018 +0800
DEV-40319: Add new configuration support in helm chart
commit a90bd9b
Merge: 8d89d4a b6a482c
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Wed Oct 17 23:53:45 2018 -0700
Merge pull request #2 in DEV/k8s-collectorset-controller from DEV-39795-support-specifying-an-escalation-dev to develop
DEV-39795: Support specifying an escalation chain for collectors - Argus part
DEV-39795: Support specifying an escalation chain for collectors - Argus part
DEV-39795: Support specifying an escalation chain for collectors - Argus part
DEV-39795: Support specifying an escalation chain for collectors - Argus part
DEV-39795: Support specifying an escalation chain for collectors - Argus part
DEV-39795: Support specifying an escalation chain for collectors - Argus part
update maintainer
commit b6a482c
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Oct 18 14:02:50 2018 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part
commit ac4c1e3
Author: jeremy jeremy.tang@logicmonitor.com
Date: Thu Oct 18 10:01:12 2018 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part
commit c9b7666
Author: jeremy jeremy.tang@logicmonitor.com
Date: Tue Oct 16 18:02:13 2018 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part
commit 5474619
Author: jeremy jeremy.tang@logicmonitor.com
Date: Tue Oct 16 17:56:19 2018 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part
commit baae17e
Author: jeremy jeremy.tang@logicmonitor.com
Date: Tue Oct 16 10:41:42 2018 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part
commit badfd5d
Merge: 8d89d4a 4dd2b5c
Author: Jeremy Tang jeremy.tang@logicmonitor.com
Date: Sun Oct 14 23:19:28 2018 -0700
Merge pull request #1 in DEV/k8s-collectorset-controller from DEV-39795-support-specifying-an-escalation to DEV-39795-support-specifying-an-escalation-dev
DEV-39795: Support specifying an escalation chain for collectors - Argus part
update maintainer
commit 4dd2b5c
Author: jeremy jeremy.tang@logicmonitor.com
Date: Mon Oct 15 11:14:42 2018 +0800
DEV-39795: Support specifying an escalation chain for collectors - Argus part