Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix type in Argus deployment template #6

Merged
merged 1 commit into from
Aug 10, 2017

Conversation

andrewrynhard
Copy link
Contributor

No description provided.

@andrewrynhard andrewrynhard self-assigned this Aug 10, 2017
@andrewrynhard andrewrynhard merged commit 4b9c1fb into logicmonitor:master Aug 10, 2017
@andrewrynhard andrewrynhard deleted the fix branch August 10, 2017 19:12
DzXiaoLMCD pushed a commit to DzXiaoLMCD/k8s-helm-charts that referenced this pull request May 24, 2019
vkumbhar94 pushed a commit that referenced this pull request Apr 16, 2020
commit 80a6758
Merge: f91d9f7 86d8a9f
Author: Vaibhav Kumbhar <[email protected]>
Date:   Tue Apr 14 03:17:17 2020 -0700

    Merge pull request #27 in DEV/k8s-helm-charts from feature/upgrade to develop

    * commit '86d8a9fd93c41e1a1e25ff7ed433b0ac196043fd':
      recreated argus & collectorset-controller charts
      DEV-58465:  updated release notes of collectorset-controller chart
      DEV-58465: added check for argus and collectorset-controller-charts with k8s version >= 1.14.*
      removed crd.yaml from collectorset-controller
      feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

commit 86d8a9f
Merge: 5631dfb 96bec07
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 05:14:41 2020 -0700

    Merge pull request #26 in DEV/k8s-helm-charts from feature/DEV-57600-remove-crd.yaml-from-collectorset-controller-helm-chart to feature/upgrade

    * commit '96bec075620026c709f2149b3d1c42c4404a52ca':
      recreated argus & collectorset-controller charts

commit 96bec07
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 17:38:47 2020 +0530

    recreated argus & collectorset-controller charts

commit 5631dfb
Merge: fbbd2b3 6fe6629
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 00:19:37 2020 -0700

    Merge pull request #24 in DEV/k8s-helm-charts from feature/DEV-57600-remove-crd.yaml-from-collectorset-controller-helm-chart to feature/upgrade

    * commit '6fe66292a3330795e0ebafe16fcd32f850e3a932':
      removed crd.yaml from collectorset-controller

commit fbbd2b3
Merge: a8dcf19 1c7498f
Author: Vaibhav Kumbhar <[email protected]>
Date:   Thu Apr 9 00:17:22 2020 -0700

    Merge pull request #25 in DEV/k8s-helm-charts from DEV-58465-update-min-kubeversion-check-for-argus-csc-charts to feature/upgrade

    * commit '1c7498f2ecdf04ea06bac5e407253a28bd8bef01':
      DEV-58465:  updated release notes of collectorset-controller chart
      DEV-58465: added check for argus and collectorset-controller-charts with k8s version >= 1.14.*

commit 1c7498f
Author: vaibhav.kumbhar <[email protected]>
Date:   Wed Apr 8 13:10:48 2020 +0530

    DEV-58465:  updated release notes of collectorset-controller chart

commit c037536
Author: vaibhav.kumbhar <[email protected]>
Date:   Wed Apr 8 13:00:51 2020 +0530

    DEV-58465: added check for argus and collectorset-controller-charts with
    k8s version >= 1.14.*

commit 6fe6629
Author: Pranay Lonkar <[email protected]>
Date:   Wed Apr 1 14:09:49 2020 +0530

    removed crd.yaml from collectorset-controller

commit a8dcf19
Author: vaibhav.kumbhar <[email protected]>
Date:   Mon Mar 9 15:20:12 2020 +0530

    feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

commit f91d9f7
Merge: dbf886c 5db02ef
Author: Jeremy Tang <[email protected]>
Date:   Mon Dec 16 17:29:28 2019 -0800

    Merge pull request #23 in DEV/k8s-helm-charts from DEV-55738-improve-the-helm-chart-of-the-argus-for-the-2.0.0-version to develop

    * commit '5db02ef994e817ac346c9702683e245bba2c4b04':
      DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

commit 5db02ef
Author: JeremyCD <[email protected]>
Date:   Mon Dec 16 14:06:24 2019 +0800

    DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

commit dbf886c
Merge: b9716e7 5facef6
Author: Daizhong Xiao <[email protected]>
Date:   Tue Sep 17 20:13:48 2019 -0700

    Merge pull request #22 in DEV/k8s-helm-charts from DEV-54259-submit-a-github-pr-for-argus-sprint-127 to develop

    * commit '5facef6aac24b727b87e2c552ef430180a774e5b':
      DEV-51767 Make collector image + repo configurable
      Add deployment rbac permission and support http proxy (#35)

commit 5facef6
Author: dzxiao <[email protected]>
Date:   Mon Sep 16 13:36:36 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 743032a
Merge: b9716e7 9193a36
Author: dzxiao <[email protected]>
Date:   Mon Sep 16 13:28:53 2019 +0800

    sync master

commit b9716e7
Merge: 18328e0 4a6501a
Author: Daizhong Xiao <[email protected]>
Date:   Wed Sep 4 17:58:55 2019 -0700

    Merge pull request #21 in DEV/k8s-helm-charts from DEV-51767-make-collector-image-repo-configurable to develop

    * commit '4a6501a7cb38f88ffb4b2cad7ece05ad5f5aaf8f':
      DEV-51767 Make collector image + repo configurable
      DEV-51767 Make collector image + repo configurable

commit 4a6501a
Author: dzxiao <[email protected]>
Date:   Wed Sep 4 15:08:55 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 0d55143
Author: dzxiao <[email protected]>
Date:   Mon Sep 2 17:00:29 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 18328e0
Merge: b10e3c7 a73b0eb
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jul 29 19:27:37 2019 -0700

    Merge pull request #20 in DEV/k8s-helm-charts from DEV-53516-create-pr-for-supporting-http-proxy to develop

    * commit 'a73b0eb9da554498684f24edfc7a7f45da66b023':
      Update the index.yaml (#34)
      change imageTag
      DEV-52339 Preparations for the release of argus

commit a73b0eb
Merge: 4475f68 012ba86
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 14:37:35 2019 +0800

    Merge branch 'master' of https://github.com/logicmonitor/k8s-helm-charts into DEV-53516-create-pr-for-supporting-http-proxy

    # Conflicts:
    #	docs/index.yaml

commit 4475f68
Merge: b10e3c7 38b614d
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 14:13:02 2019 +0800

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

commit b10e3c7
Merge: 16598ae 25850de
Author: Daizhong Xiao <[email protected]>
Date:   Tue Jul 23 17:57:27 2019 -0700

    Merge pull request #17 in DEV/k8s-helm-charts from DEV-52692-support-proxy-for-dockerized-collector to develop

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

commit 25850de
Author: dzxiao <[email protected]>
Date:   Tue Jul 23 14:16:35 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit f9586e0
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 16:05:07 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit 16598ae
Merge: 70d5bd9 8611e4f
Author: Daizhong Xiao <[email protected]>
Date:   Fri Jul 19 00:29:01 2019 -0700

    Merge pull request #19 in DEV/k8s-helm-charts from bugfix/DEV-53328-collector-clusterrole-permissions to develop

    * commit '8611e4f4b38eed4f413d34abe5a3aef903b163c0':
      DEV-53328 Collector ClusterRole permissions do not include deployments

commit 0c5c8cd
Merge: 07ec05a 70d5bd9
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 14:04:53 2019 +0800

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

commit 8611e4f
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 16:08:09 2019 +0800

    DEV-53328 Collector ClusterRole permissions do not include deployments

commit 38b614d
Merge: d077b33 70d5bd9
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:43:11 2019 +0800

    Update the index.yaml

commit 70d5bd9
Merge: 7b10a67 4c18474
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jun 24 00:35:42 2019 -0700

    Merge pull request #16 in DEV/k8s-helm-charts from DEV-52875-create-a-request-pull-for-github to develop

    * commit '4c18474730b0c56a093caeba26ceffeea610643f':
      DEV-52875 Make and update the index.yaml
      Add deployment RBAC support (#32)
      Dev-49484 add the rbac for the minishift case (#31)
      Stash to GitHub (#28)

commit 4c18474
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:25:26 2019 +0800

    DEV-52875 Make and update the index.yaml

commit 0e27305
Merge: 7b10a67 21b6d31
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:16:36 2019 +0800

    DEV-52875 Merge from github master branch

commit 07ec05a
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 03:46:43 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 543ada0
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 01:43:02 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 5b9ce2d
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:53:49 2019 +0800

    DEV-52044 Fix the comments

commit 0180478
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 18:30:25 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 00c8d5b
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 00:46:36 2019 +0800

    DEV-52044 Add http proxy configuration options

commit d077b33
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:46:16 2019 +0800

    change imageTag

commit 6387e5c
Merge: 419f634 12e8774
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 16:43:11 2019 +0800

    Merge from master branch

commit 419f634
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 16:23:12 2019 +0800

    DEV-52339 Preparations for the release of argus

commit 8169bdf
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 09:23:34 2019 +0800

    DEV-52044 Add http proxy configuration options

commit 7b10a67
Merge: d118014 d49f21b
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jun 17 22:53:38 2019 -0700

    Merge pull request #13 in DEV/k8s-helm-charts from feature/DEV-49675-devops-monitor-kubernetes-deployments to develop

    * commit 'd49f21bb4208e285a8e636eeeabda3caca422fe0':
      DEV-49675 Add argus rbac for deployments
      DEV-51561 Add apps apiGroups rbac for deployments api

commit d49f21b
Author: dzxiao <[email protected]>
Date:   Tue Jun 18 13:50:53 2019 +0800

    DEV-49675 Add argus rbac for deployments

commit 81ab989
Author: dzxiao <[email protected]>
Date:   Thu Jun 13 17:57:06 2019 +0800

    DEV-51952 Research http & http proxy configuration options

commit addd1b8
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 22:40:59 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit a9af723
Merge: d118014 ce2cb14
Author: Daizhong Xiao <[email protected]>
Date:   Sat May 11 01:57:43 2019 -0700

    Merge pull request #11 in DEV/k8s-helm-charts from bugfix/DEV-51561-permission-issue-for-k8s-deployment to feature/DEV-49675-devops-monitor-kubernetes-deployments

    * commit 'ce2cb147d1e63c1d63b0a50ddababa3c59ff3b6a':
      DEV-51561 Add apps apiGroups rbac for deployments api

commit ce2cb14
Author: dzxiao <[email protected]>
Date:   Fri May 10 16:37:28 2019 +0800

    DEV-51561 Add apps apiGroups rbac for deployments api

commit d118014
Author: jeremy <[email protected]>
Date:   Wed Mar 20 10:45:28 2019 +0800

    improve the version

commit f73d268
Merge: cdd8216 0c256b7
Author: Jeremy Tang <[email protected]>
Date:   Sun Mar 10 20:16:08 2019 -0700

    Merge pull request #8 in DEV/k8s-helm-charts from DEV-49484-check-and-add-nodes-stats-to-collector to develop

    * commit '0c256b76b68ff1cad7fad7b0a144efc39feed8f2':
      DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

commit cdd8216
Merge: f4d036d 8382dde
Author: Jeremy Tang <[email protected]>
Date:   Wed Mar 6 18:34:04 2019 -0800

    Merge pull request #7 in DEV/k8s-helm-charts from DEV-49511-collectorset-controller-allow-user to develop

    * commit '8382dde2d8c569c6827481aed5ccd833642046f3':
      DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

commit 0c256b7
Author: jeremy <[email protected]>
Date:   Tue Mar 5 10:47:17 2019 +0800

    DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

commit 8382dde
Author: jeremy <[email protected]>
Date:   Mon Mar 4 17:58:17 2019 +0800

    DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

commit f4d036d
Author: jeremy <[email protected]>
Date:   Fri Dec 21 11:25:06 2018 +0800

    improved by make

commit 222a529
Author: jeremy <[email protected]>
Date:   Fri Dec 21 10:48:44 2018 +0800

    improved by make

commit 07929c1
Merge: 15c62fa cdc2c49
Author: Jeremy Tang <[email protected]>
Date:   Tue Dec 11 18:26:39 2018 -0800

    Merge pull request #6 in DEV/k8s-helm-charts from DEV-41170-make-the-collector-group-name-s to develop

    * commit 'cdc2c497bf71cb50493385d18f4cc0575bd8fdc7':
      DEV-41170: Make the collector group name's casing the same as user defined

commit cdc2c49
Author: jeremy <[email protected]>
Date:   Mon Dec 10 15:14:21 2018 +0800

    DEV-41170: Make the collector group name's casing the same as user defined

commit 15c62fa
Merge: a112003 95530db
Author: Jeremy Tang <[email protected]>
Date:   Wed Nov 21 17:25:03 2018 -0800

    Merge pull request #5 in DEV/k8s-helm-charts from DEV-40760-maintain-the-capitalization-of to develop

    * commit '95530db1a8ac6cda72cd025f55ea7eaf99680914':
      DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

commit 95530db
Author: jeremy <[email protected]>
Date:   Wed Nov 21 14:12:13 2018 +0800

    DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

commit a112003
Merge: 7788b7a 0f49f00
Author: Jeremy Tang <[email protected]>
Date:   Tue Oct 23 22:34:11 2018 -0700

    Merge pull request #3 in DEV/k8s-helm-charts from DEV-40319-add-new-configuration-support-in to develop

    * commit '0f49f008ecf732e7ea47361e6f01a775562132e5':
      DEV-40319: Add new configuration support in helm chart

commit 0f49f00
Author: jeremy <[email protected]>
Date:   Tue Oct 23 21:02:30 2018 +0800

    DEV-40319: Add new configuration support in helm chart

commit 7788b7a
Merge: 453b400 19cb6d0
Author: Jeremy Tang <[email protected]>
Date:   Wed Oct 17 23:54:03 2018 -0700

    Merge pull request #2 in DEV/k8s-helm-charts from DEV-39795-support-specifying-an-escalation to develop

    * commit '19cb6d08103676af5b9b3cfcf6baf4de2b6853e9':
      DEV-39795: Support specifying an escalation chain for collectors
      DEV-39795: Support specifying an escalation chain for collectors

commit 19cb6d0
Author: jeremy <[email protected]>
Date:   Thu Oct 18 10:01:44 2018 +0800

    DEV-39795: Support specifying an escalation chain for collectors

commit e13a688
Author: jeremy <[email protected]>
Date:   Tue Oct 16 10:44:25 2018 +0800

    DEV-39795: Support specifying an escalation chain for collectors

commit 453b400
Merge: e7d0aeb 0069c29
Author: Jeremy Tang <[email protected]>
Date:   Sun Oct 14 22:56:23 2018 -0700

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

    * commit '0069c29ebac9b26de692b3690c136fefd091e0ff':
      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-39965: Allow the user to specify a parent group during installation

commit 0069c29
Author: jeremy <[email protected]>
Date:   Fri Oct 12 15:09:10 2018 +0800

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

commit ddae67a
Author: jeremy <[email protected]>
Date:   Fri Oct 12 14:24:47 2018 +0800

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

commit 7c92de6
Author: jeremy <[email protected]>
Date:   Fri Oct 12 10:10:15 2018 +0800

    DEV-39965: Allow the user to specify a parent group during installation
pyang55 pushed a commit that referenced this pull request Apr 22, 2020
commit 80a6758
Merge: f91d9f7 86d8a9f
Author: Vaibhav Kumbhar <[email protected]>
Date:   Tue Apr 14 03:17:17 2020 -0700

    Merge pull request #27 in DEV/k8s-helm-charts from feature/upgrade to develop

    * commit '86d8a9fd93c41e1a1e25ff7ed433b0ac196043fd':
      recreated argus & collectorset-controller charts
      DEV-58465:  updated release notes of collectorset-controller chart
      DEV-58465: added check for argus and collectorset-controller-charts with k8s version >= 1.14.*
      removed crd.yaml from collectorset-controller
      feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

commit 86d8a9f
Merge: 5631dfb 96bec07
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 05:14:41 2020 -0700

    Merge pull request #26 in DEV/k8s-helm-charts from feature/DEV-57600-remove-crd.yaml-from-collectorset-controller-helm-chart to feature/upgrade

    * commit '96bec075620026c709f2149b3d1c42c4404a52ca':
      recreated argus & collectorset-controller charts

commit 96bec07
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 17:38:47 2020 +0530

    recreated argus & collectorset-controller charts

commit 5631dfb
Merge: fbbd2b3 6fe6629
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 00:19:37 2020 -0700

    Merge pull request #24 in DEV/k8s-helm-charts from feature/DEV-57600-remove-crd.yaml-from-collectorset-controller-helm-chart to feature/upgrade

    * commit '6fe66292a3330795e0ebafe16fcd32f850e3a932':
      removed crd.yaml from collectorset-controller

commit fbbd2b3
Merge: a8dcf19 1c7498f
Author: Vaibhav Kumbhar <[email protected]>
Date:   Thu Apr 9 00:17:22 2020 -0700

    Merge pull request #25 in DEV/k8s-helm-charts from DEV-58465-update-min-kubeversion-check-for-argus-csc-charts to feature/upgrade

    * commit '1c7498f2ecdf04ea06bac5e407253a28bd8bef01':
      DEV-58465:  updated release notes of collectorset-controller chart
      DEV-58465: added check for argus and collectorset-controller-charts with k8s version >= 1.14.*

commit 1c7498f
Author: vaibhav.kumbhar <[email protected]>
Date:   Wed Apr 8 13:10:48 2020 +0530

    DEV-58465:  updated release notes of collectorset-controller chart

commit c037536
Author: vaibhav.kumbhar <[email protected]>
Date:   Wed Apr 8 13:00:51 2020 +0530

    DEV-58465: added check for argus and collectorset-controller-charts with
    k8s version >= 1.14.*

commit 6fe6629
Author: Pranay Lonkar <[email protected]>
Date:   Wed Apr 1 14:09:49 2020 +0530

    removed crd.yaml from collectorset-controller

commit a8dcf19
Author: vaibhav.kumbhar <[email protected]>
Date:   Mon Mar 9 15:20:12 2020 +0530

    feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

commit f91d9f7
Merge: dbf886c 5db02ef
Author: Jeremy Tang <[email protected]>
Date:   Mon Dec 16 17:29:28 2019 -0800

    Merge pull request #23 in DEV/k8s-helm-charts from DEV-55738-improve-the-helm-chart-of-the-argus-for-the-2.0.0-version to develop

    * commit '5db02ef994e817ac346c9702683e245bba2c4b04':
      DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

commit 5db02ef
Author: JeremyCD <[email protected]>
Date:   Mon Dec 16 14:06:24 2019 +0800

    DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

commit dbf886c
Merge: b9716e7 5facef6
Author: Daizhong Xiao <[email protected]>
Date:   Tue Sep 17 20:13:48 2019 -0700

    Merge pull request #22 in DEV/k8s-helm-charts from DEV-54259-submit-a-github-pr-for-argus-sprint-127 to develop

    * commit '5facef6aac24b727b87e2c552ef430180a774e5b':
      DEV-51767 Make collector image + repo configurable
      Add deployment rbac permission and support http proxy (#35)

commit 5facef6
Author: dzxiao <[email protected]>
Date:   Mon Sep 16 13:36:36 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 743032a
Merge: b9716e7 9193a36
Author: dzxiao <[email protected]>
Date:   Mon Sep 16 13:28:53 2019 +0800

    sync master

commit b9716e7
Merge: 18328e0 4a6501a
Author: Daizhong Xiao <[email protected]>
Date:   Wed Sep 4 17:58:55 2019 -0700

    Merge pull request #21 in DEV/k8s-helm-charts from DEV-51767-make-collector-image-repo-configurable to develop

    * commit '4a6501a7cb38f88ffb4b2cad7ece05ad5f5aaf8f':
      DEV-51767 Make collector image + repo configurable
      DEV-51767 Make collector image + repo configurable

commit 4a6501a
Author: dzxiao <[email protected]>
Date:   Wed Sep 4 15:08:55 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 0d55143
Author: dzxiao <[email protected]>
Date:   Mon Sep 2 17:00:29 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 18328e0
Merge: b10e3c7 a73b0eb
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jul 29 19:27:37 2019 -0700

    Merge pull request #20 in DEV/k8s-helm-charts from DEV-53516-create-pr-for-supporting-http-proxy to develop

    * commit 'a73b0eb9da554498684f24edfc7a7f45da66b023':
      Update the index.yaml (#34)
      change imageTag
      DEV-52339 Preparations for the release of argus

commit a73b0eb
Merge: 4475f68 012ba86
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 14:37:35 2019 +0800

    Merge branch 'master' of https://github.com/logicmonitor/k8s-helm-charts into DEV-53516-create-pr-for-supporting-http-proxy

    # Conflicts:
    #	docs/index.yaml

commit 4475f68
Merge: b10e3c7 38b614d
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 14:13:02 2019 +0800

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

commit b10e3c7
Merge: 16598ae 25850de
Author: Daizhong Xiao <[email protected]>
Date:   Tue Jul 23 17:57:27 2019 -0700

    Merge pull request #17 in DEV/k8s-helm-charts from DEV-52692-support-proxy-for-dockerized-collector to develop

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

commit 25850de
Author: dzxiao <[email protected]>
Date:   Tue Jul 23 14:16:35 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit f9586e0
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 16:05:07 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit 16598ae
Merge: 70d5bd9 8611e4f
Author: Daizhong Xiao <[email protected]>
Date:   Fri Jul 19 00:29:01 2019 -0700

    Merge pull request #19 in DEV/k8s-helm-charts from bugfix/DEV-53328-collector-clusterrole-permissions to develop

    * commit '8611e4f4b38eed4f413d34abe5a3aef903b163c0':
      DEV-53328 Collector ClusterRole permissions do not include deployments

commit 0c5c8cd
Merge: 07ec05a 70d5bd9
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 14:04:53 2019 +0800

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

commit 8611e4f
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 16:08:09 2019 +0800

    DEV-53328 Collector ClusterRole permissions do not include deployments

commit 38b614d
Merge: d077b33 70d5bd9
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:43:11 2019 +0800

    Update the index.yaml

commit 70d5bd9
Merge: 7b10a67 4c18474
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jun 24 00:35:42 2019 -0700

    Merge pull request #16 in DEV/k8s-helm-charts from DEV-52875-create-a-request-pull-for-github to develop

    * commit '4c18474730b0c56a093caeba26ceffeea610643f':
      DEV-52875 Make and update the index.yaml
      Add deployment RBAC support (#32)
      Dev-49484 add the rbac for the minishift case (#31)
      Stash to GitHub (#28)

commit 4c18474
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:25:26 2019 +0800

    DEV-52875 Make and update the index.yaml

commit 0e27305
Merge: 7b10a67 21b6d31
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:16:36 2019 +0800

    DEV-52875 Merge from github master branch

commit 07ec05a
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 03:46:43 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 543ada0
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 01:43:02 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 5b9ce2d
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:53:49 2019 +0800

    DEV-52044 Fix the comments

commit 0180478
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 18:30:25 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 00c8d5b
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 00:46:36 2019 +0800

    DEV-52044 Add http proxy configuration options

commit d077b33
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:46:16 2019 +0800

    change imageTag

commit 6387e5c
Merge: 419f634 12e8774
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 16:43:11 2019 +0800

    Merge from master branch

commit 419f634
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 16:23:12 2019 +0800

    DEV-52339 Preparations for the release of argus

commit 8169bdf
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 09:23:34 2019 +0800

    DEV-52044 Add http proxy configuration options

commit 7b10a67
Merge: d118014 d49f21b
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jun 17 22:53:38 2019 -0700

    Merge pull request #13 in DEV/k8s-helm-charts from feature/DEV-49675-devops-monitor-kubernetes-deployments to develop

    * commit 'd49f21bb4208e285a8e636eeeabda3caca422fe0':
      DEV-49675 Add argus rbac for deployments
      DEV-51561 Add apps apiGroups rbac for deployments api

commit d49f21b
Author: dzxiao <[email protected]>
Date:   Tue Jun 18 13:50:53 2019 +0800

    DEV-49675 Add argus rbac for deployments

commit 81ab989
Author: dzxiao <[email protected]>
Date:   Thu Jun 13 17:57:06 2019 +0800

    DEV-51952 Research http & http proxy configuration options

commit addd1b8
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 22:40:59 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit a9af723
Merge: d118014 ce2cb14
Author: Daizhong Xiao <[email protected]>
Date:   Sat May 11 01:57:43 2019 -0700

    Merge pull request #11 in DEV/k8s-helm-charts from bugfix/DEV-51561-permission-issue-for-k8s-deployment to feature/DEV-49675-devops-monitor-kubernetes-deployments

    * commit 'ce2cb147d1e63c1d63b0a50ddababa3c59ff3b6a':
      DEV-51561 Add apps apiGroups rbac for deployments api

commit ce2cb14
Author: dzxiao <[email protected]>
Date:   Fri May 10 16:37:28 2019 +0800

    DEV-51561 Add apps apiGroups rbac for deployments api

commit d118014
Author: jeremy <[email protected]>
Date:   Wed Mar 20 10:45:28 2019 +0800

    improve the version

commit f73d268
Merge: cdd8216 0c256b7
Author: Jeremy Tang <[email protected]>
Date:   Sun Mar 10 20:16:08 2019 -0700

    Merge pull request #8 in DEV/k8s-helm-charts from DEV-49484-check-and-add-nodes-stats-to-collector to develop

    * commit '0c256b76b68ff1cad7fad7b0a144efc39feed8f2':
      DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

commit cdd8216
Merge: f4d036d 8382dde
Author: Jeremy Tang <[email protected]>
Date:   Wed Mar 6 18:34:04 2019 -0800

    Merge pull request #7 in DEV/k8s-helm-charts from DEV-49511-collectorset-controller-allow-user to develop

    * commit '8382dde2d8c569c6827481aed5ccd833642046f3':
      DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

commit 0c256b7
Author: jeremy <[email protected]>
Date:   Tue Mar 5 10:47:17 2019 +0800

    DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

commit 8382dde
Author: jeremy <[email protected]>
Date:   Mon Mar 4 17:58:17 2019 +0800

    DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

commit f4d036d
Author: jeremy <[email protected]>
Date:   Fri Dec 21 11:25:06 2018 +0800

    improved by make

commit 222a529
Author: jeremy <[email protected]>
Date:   Fri Dec 21 10:48:44 2018 +0800

    improved by make

commit 07929c1
Merge: 15c62fa cdc2c49
Author: Jeremy Tang <[email protected]>
Date:   Tue Dec 11 18:26:39 2018 -0800

    Merge pull request #6 in DEV/k8s-helm-charts from DEV-41170-make-the-collector-group-name-s to develop

    * commit 'cdc2c497bf71cb50493385d18f4cc0575bd8fdc7':
      DEV-41170: Make the collector group name's casing the same as user defined

commit cdc2c49
Author: jeremy <[email protected]>
Date:   Mon Dec 10 15:14:21 2018 +0800

    DEV-41170: Make the collector group name's casing the same as user defined

commit 15c62fa
Merge: a112003 95530db
Author: Jeremy Tang <[email protected]>
Date:   Wed Nov 21 17:25:03 2018 -0800

    Merge pull request #5 in DEV/k8s-helm-charts from DEV-40760-maintain-the-capitalization-of to develop

    * commit '95530db1a8ac6cda72cd025f55ea7eaf99680914':
      DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

commit 95530db
Author: jeremy <[email protected]>
Date:   Wed Nov 21 14:12:13 2018 +0800

    DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

commit a112003
Merge: 7788b7a 0f49f00
Author: Jeremy Tang <[email protected]>
Date:   Tue Oct 23 22:34:11 2018 -0700

    Merge pull request #3 in DEV/k8s-helm-charts from DEV-40319-add-new-configuration-support-in to develop

    * commit '0f49f008ecf732e7ea47361e6f01a775562132e5':
      DEV-40319: Add new configuration support in helm chart

commit 0f49f00
Author: jeremy <[email protected]>
Date:   Tue Oct 23 21:02:30 2018 +0800

    DEV-40319: Add new configuration support in helm chart

commit 7788b7a
Merge: 453b400 19cb6d0
Author: Jeremy Tang <[email protected]>
Date:   Wed Oct 17 23:54:03 2018 -0700

    Merge pull request #2 in DEV/k8s-helm-charts from DEV-39795-support-specifying-an-escalation to develop

    * commit '19cb6d08103676af5b9b3cfcf6baf4de2b6853e9':
      DEV-39795: Support specifying an escalation chain for collectors
      DEV-39795: Support specifying an escalation chain for collectors

commit 19cb6d0
Author: jeremy <[email protected]>
Date:   Thu Oct 18 10:01:44 2018 +0800

    DEV-39795: Support specifying an escalation chain for collectors

commit e13a688
Author: jeremy <[email protected]>
Date:   Tue Oct 16 10:44:25 2018 +0800

    DEV-39795: Support specifying an escalation chain for collectors

commit 453b400
Merge: e7d0aeb 0069c29
Author: Jeremy Tang <[email protected]>
Date:   Sun Oct 14 22:56:23 2018 -0700

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

    * commit '0069c29ebac9b26de692b3690c136fefd091e0ff':
      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-39965: Allow the user to specify a parent group during installation

commit 0069c29
Author: jeremy <[email protected]>
Date:   Fri Oct 12 15:09:10 2018 +0800

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

commit ddae67a
Author: jeremy <[email protected]>
Date:   Fri Oct 12 14:24:47 2018 +0800

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

commit 7c92de6
Author: jeremy <[email protected]>
Date:   Fri Oct 12 10:10:15 2018 +0800

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

Co-authored-by: vaibhav.kumbhar <[email protected]>
pyang55 pushed a commit that referenced this pull request Apr 27, 2020
* 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-39965: Allow the user to specify a parent group during installation

* DEV-39795: Support specifying an escalation chain for collectors

* DEV-39795: Support specifying an escalation chain for collectors

* DEV-40319: Add new configuration support in helm chart

* DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

* DEV-41170: Make the collector group name's casing the same as user defined

* improved by make

* improved by make

* DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

* DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

* improve the version

* DEV-51561 Add apps apiGroups rbac for deployments api

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

* DEV-51952 Research http & http proxy configuration options

* DEV-49675 Add argus rbac for deployments

* DEV-52044 Add http proxy configuration options

* DEV-52339 Preparations for the release of argus

* change imageTag

* DEV-52044 Add http proxy configuration options

* DEV-52044 Add httpURL parameter description

* DEV-52044 Fix the comments

* DEV-52044 Improve the http proxy configuration

* DEV-52044 Improve the http proxy configuration

* DEV-52875 Make and update the index.yaml

* DEV-53328 Collector ClusterRole permissions do not include deployments

* DEV-52692 Support proxy for dockerized collector

* DEV-52692 Support proxy for dockerized collector

* DEV-51767 Make collector image + repo configurable

* DEV-51767 Make collector image + repo configurable

* DEV-51767 Make collector image + repo configurable

* DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

* feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

* removed crd.yaml from collectorset-controller

* DEV-58465: added check for argus and collectorset-controller-charts with
k8s version >= 1.14.*

* DEV-58465:  updated release notes of collectorset-controller chart

* recreated argus & collectorset-controller charts

* Squashed commit of the following:

commit 80a6758
Merge: f91d9f7 86d8a9f
Author: Vaibhav Kumbhar <[email protected]>
Date:   Tue Apr 14 03:17:17 2020 -0700

    Merge pull request #27 in DEV/k8s-helm-charts from feature/upgrade to develop

    * commit '86d8a9fd93c41e1a1e25ff7ed433b0ac196043fd':
      recreated argus & collectorset-controller charts
      DEV-58465:  updated release notes of collectorset-controller chart
      DEV-58465: added check for argus and collectorset-controller-charts with k8s version >= 1.14.*
      removed crd.yaml from collectorset-controller
      feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

commit 86d8a9f
Merge: 5631dfb 96bec07
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 05:14:41 2020 -0700

    Merge pull request #26 in DEV/k8s-helm-charts from feature/DEV-57600-remove-crd.yaml-from-collectorset-controller-helm-chart to feature/upgrade

    * commit '96bec075620026c709f2149b3d1c42c4404a52ca':
      recreated argus & collectorset-controller charts

commit 96bec07
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 17:38:47 2020 +0530

    recreated argus & collectorset-controller charts

commit 5631dfb
Merge: fbbd2b3 6fe6629
Author: Pranay Lonkar <[email protected]>
Date:   Thu Apr 9 00:19:37 2020 -0700

    Merge pull request #24 in DEV/k8s-helm-charts from feature/DEV-57600-remove-crd.yaml-from-collectorset-controller-helm-chart to feature/upgrade

    * commit '6fe66292a3330795e0ebafe16fcd32f850e3a932':
      removed crd.yaml from collectorset-controller

commit fbbd2b3
Merge: a8dcf19 1c7498f
Author: Vaibhav Kumbhar <[email protected]>
Date:   Thu Apr 9 00:17:22 2020 -0700

    Merge pull request #25 in DEV/k8s-helm-charts from DEV-58465-update-min-kubeversion-check-for-argus-csc-charts to feature/upgrade

    * commit '1c7498f2ecdf04ea06bac5e407253a28bd8bef01':
      DEV-58465:  updated release notes of collectorset-controller chart
      DEV-58465: added check for argus and collectorset-controller-charts with k8s version >= 1.14.*

commit 1c7498f
Author: vaibhav.kumbhar <[email protected]>
Date:   Wed Apr 8 13:10:48 2020 +0530

    DEV-58465:  updated release notes of collectorset-controller chart

commit c037536
Author: vaibhav.kumbhar <[email protected]>
Date:   Wed Apr 8 13:00:51 2020 +0530

    DEV-58465: added check for argus and collectorset-controller-charts with
    k8s version >= 1.14.*

commit 6fe6629
Author: Pranay Lonkar <[email protected]>
Date:   Wed Apr 1 14:09:49 2020 +0530

    removed crd.yaml from collectorset-controller

commit a8dcf19
Author: vaibhav.kumbhar <[email protected]>
Date:   Mon Mar 9 15:20:12 2020 +0530

    feature/upgrade:  dev_vk_upgrade_changes: upgrade changes

commit f91d9f7
Merge: dbf886c 5db02ef
Author: Jeremy Tang <[email protected]>
Date:   Mon Dec 16 17:29:28 2019 -0800

    Merge pull request #23 in DEV/k8s-helm-charts from DEV-55738-improve-the-helm-chart-of-the-argus-for-the-2.0.0-version to develop

    * commit '5db02ef994e817ac346c9702683e245bba2c4b04':
      DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

commit 5db02ef
Author: JeremyCD <[email protected]>
Date:   Mon Dec 16 14:06:24 2019 +0800

    DEV-55738 Improve the helm chart of the argus for the 2.0.0 version

commit dbf886c
Merge: b9716e7 5facef6
Author: Daizhong Xiao <[email protected]>
Date:   Tue Sep 17 20:13:48 2019 -0700

    Merge pull request #22 in DEV/k8s-helm-charts from DEV-54259-submit-a-github-pr-for-argus-sprint-127 to develop

    * commit '5facef6aac24b727b87e2c552ef430180a774e5b':
      DEV-51767 Make collector image + repo configurable
      Add deployment rbac permission and support http proxy (#35)

commit 5facef6
Author: dzxiao <[email protected]>
Date:   Mon Sep 16 13:36:36 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 743032a
Merge: b9716e7 9193a36
Author: dzxiao <[email protected]>
Date:   Mon Sep 16 13:28:53 2019 +0800

    sync master

commit b9716e7
Merge: 18328e0 4a6501a
Author: Daizhong Xiao <[email protected]>
Date:   Wed Sep 4 17:58:55 2019 -0700

    Merge pull request #21 in DEV/k8s-helm-charts from DEV-51767-make-collector-image-repo-configurable to develop

    * commit '4a6501a7cb38f88ffb4b2cad7ece05ad5f5aaf8f':
      DEV-51767 Make collector image + repo configurable
      DEV-51767 Make collector image + repo configurable

commit 4a6501a
Author: dzxiao <[email protected]>
Date:   Wed Sep 4 15:08:55 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 0d55143
Author: dzxiao <[email protected]>
Date:   Mon Sep 2 17:00:29 2019 +0800

    DEV-51767 Make collector image + repo configurable

commit 18328e0
Merge: b10e3c7 a73b0eb
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jul 29 19:27:37 2019 -0700

    Merge pull request #20 in DEV/k8s-helm-charts from DEV-53516-create-pr-for-supporting-http-proxy to develop

    * commit 'a73b0eb9da554498684f24edfc7a7f45da66b023':
      Update the index.yaml (#34)
      change imageTag
      DEV-52339 Preparations for the release of argus

commit a73b0eb
Merge: 4475f68 012ba86
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 14:37:35 2019 +0800

    Merge branch 'master' of https://github.com/logicmonitor/k8s-helm-charts into DEV-53516-create-pr-for-supporting-http-proxy

    # Conflicts:
    #	docs/index.yaml

commit 4475f68
Merge: b10e3c7 38b614d
Author: dzxiao <[email protected]>
Date:   Mon Jul 29 14:13:02 2019 +0800

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

commit b10e3c7
Merge: 16598ae 25850de
Author: Daizhong Xiao <[email protected]>
Date:   Tue Jul 23 17:57:27 2019 -0700

    Merge pull request #17 in DEV/k8s-helm-charts from DEV-52692-support-proxy-for-dockerized-collector to develop

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

commit 25850de
Author: dzxiao <[email protected]>
Date:   Tue Jul 23 14:16:35 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit f9586e0
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 16:05:07 2019 +0800

    DEV-52692 Support proxy for dockerized collector

commit 16598ae
Merge: 70d5bd9 8611e4f
Author: Daizhong Xiao <[email protected]>
Date:   Fri Jul 19 00:29:01 2019 -0700

    Merge pull request #19 in DEV/k8s-helm-charts from bugfix/DEV-53328-collector-clusterrole-permissions to develop

    * commit '8611e4f4b38eed4f413d34abe5a3aef903b163c0':
      DEV-53328 Collector ClusterRole permissions do not include deployments

commit 0c5c8cd
Merge: 07ec05a 70d5bd9
Author: dzxiao <[email protected]>
Date:   Fri Jul 19 14:04:53 2019 +0800

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

commit 8611e4f
Author: dzxiao <[email protected]>
Date:   Thu Jul 18 16:08:09 2019 +0800

    DEV-53328 Collector ClusterRole permissions do not include deployments

commit 38b614d
Merge: d077b33 70d5bd9
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:43:11 2019 +0800

    Update the index.yaml

commit 70d5bd9
Merge: 7b10a67 4c18474
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jun 24 00:35:42 2019 -0700

    Merge pull request #16 in DEV/k8s-helm-charts from DEV-52875-create-a-request-pull-for-github to develop

    * commit '4c18474730b0c56a093caeba26ceffeea610643f':
      DEV-52875 Make and update the index.yaml
      Add deployment RBAC support (#32)
      Dev-49484 add the rbac for the minishift case (#31)
      Stash to GitHub (#28)

commit 4c18474
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:25:26 2019 +0800

    DEV-52875 Make and update the index.yaml

commit 0e27305
Merge: 7b10a67 21b6d31
Author: dzxiao <[email protected]>
Date:   Mon Jun 24 15:16:36 2019 +0800

    DEV-52875 Merge from github master branch

commit 07ec05a
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 03:46:43 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 543ada0
Author: dzxiao <[email protected]>
Date:   Sat Jun 22 01:43:02 2019 +0800

    DEV-52044 Improve the http proxy configuration

commit 5b9ce2d
Author: dzxiao <[email protected]>
Date:   Fri Jun 21 15:53:49 2019 +0800

    DEV-52044 Fix the comments

commit 0180478
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 18:30:25 2019 +0800

    DEV-52044 Add httpURL parameter description

commit 00c8d5b
Author: dzxiao <[email protected]>
Date:   Thu Jun 20 00:46:36 2019 +0800

    DEV-52044 Add http proxy configuration options

commit d077b33
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 17:46:16 2019 +0800

    change imageTag

commit 6387e5c
Merge: 419f634 12e8774
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 16:43:11 2019 +0800

    Merge from master branch

commit 419f634
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 16:23:12 2019 +0800

    DEV-52339 Preparations for the release of argus

commit 8169bdf
Author: dzxiao <[email protected]>
Date:   Wed Jun 19 09:23:34 2019 +0800

    DEV-52044 Add http proxy configuration options

commit 7b10a67
Merge: d118014 d49f21b
Author: Daizhong Xiao <[email protected]>
Date:   Mon Jun 17 22:53:38 2019 -0700

    Merge pull request #13 in DEV/k8s-helm-charts from feature/DEV-49675-devops-monitor-kubernetes-deployments to develop

    * commit 'd49f21bb4208e285a8e636eeeabda3caca422fe0':
      DEV-49675 Add argus rbac for deployments
      DEV-51561 Add apps apiGroups rbac for deployments api

commit d49f21b
Author: dzxiao <[email protected]>
Date:   Tue Jun 18 13:50:53 2019 +0800

    DEV-49675 Add argus rbac for deployments

commit 81ab989
Author: dzxiao <[email protected]>
Date:   Thu Jun 13 17:57:06 2019 +0800

    DEV-51952 Research http & http proxy configuration options

commit addd1b8
Author: dzxiao <[email protected]>
Date:   Wed Jun 12 22:40:59 2019 +0800

    DEV-51952 Research argus http & http proxy configuration options

commit a9af723
Merge: d118014 ce2cb14
Author: Daizhong Xiao <[email protected]>
Date:   Sat May 11 01:57:43 2019 -0700

    Merge pull request #11 in DEV/k8s-helm-charts from bugfix/DEV-51561-permission-issue-for-k8s-deployment to feature/DEV-49675-devops-monitor-kubernetes-deployments

    * commit 'ce2cb147d1e63c1d63b0a50ddababa3c59ff3b6a':
      DEV-51561 Add apps apiGroups rbac for deployments api

commit ce2cb14
Author: dzxiao <[email protected]>
Date:   Fri May 10 16:37:28 2019 +0800

    DEV-51561 Add apps apiGroups rbac for deployments api

commit d118014
Author: jeremy <[email protected]>
Date:   Wed Mar 20 10:45:28 2019 +0800

    improve the version

commit f73d268
Merge: cdd8216 0c256b7
Author: Jeremy Tang <[email protected]>
Date:   Sun Mar 10 20:16:08 2019 -0700

    Merge pull request #8 in DEV/k8s-helm-charts from DEV-49484-check-and-add-nodes-stats-to-collector to develop

    * commit '0c256b76b68ff1cad7fad7b0a144efc39feed8f2':
      DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

commit cdd8216
Merge: f4d036d 8382dde
Author: Jeremy Tang <[email protected]>
Date:   Wed Mar 6 18:34:04 2019 -0800

    Merge pull request #7 in DEV/k8s-helm-charts from DEV-49511-collectorset-controller-allow-user to develop

    * commit '8382dde2d8c569c6827481aed5ccd833642046f3':
      DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

commit 0c256b7
Author: jeremy <[email protected]>
Date:   Tue Mar 5 10:47:17 2019 +0800

    DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts

commit 8382dde
Author: jeremy <[email protected]>
Date:   Mon Mar 4 17:58:17 2019 +0800

    DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring

commit f4d036d
Author: jeremy <[email protected]>
Date:   Fri Dec 21 11:25:06 2018 +0800

    improved by make

commit 222a529
Author: jeremy <[email protected]>
Date:   Fri Dec 21 10:48:44 2018 +0800

    improved by make

commit 07929c1
Merge: 15c62fa cdc2c49
Author: Jeremy Tang <[email protected]>
Date:   Tue Dec 11 18:26:39 2018 -0800

    Merge pull request #6 in DEV/k8s-helm-charts from DEV-41170-make-the-collector-group-name-s to develop

    * commit 'cdc2c497bf71cb50493385d18f4cc0575bd8fdc7':
      DEV-41170: Make the collector group name's casing the same as user defined

commit cdc2c49
Author: jeremy <[email protected]>
Date:   Mon Dec 10 15:14:21 2018 +0800

    DEV-41170: Make the collector group name's casing the same as user defined

commit 15c62fa
Merge: a112003 95530db
Author: Jeremy Tang <[email protected]>
Date:   Wed Nov 21 17:25:03 2018 -0800

    Merge pull request #5 in DEV/k8s-helm-charts from DEV-40760-maintain-the-capitalization-of to develop

    * commit '95530db1a8ac6cda72cd025f55ea7eaf99680914':
      DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

commit 95530db
Author: jeremy <[email protected]>
Date:   Wed Nov 21 14:12:13 2018 +0800

    DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group

commit a112003
Merge: 7788b7a 0f49f00
Author: Jeremy Tang <[email protected]>
Date:   Tue Oct 23 22:34:11 2018 -0700

    Merge pull request #3 in DEV/k8s-helm-charts from DEV-40319-add-new-configuration-support-in to develop

    * commit '0f49f008ecf732e7ea47361e6f01a775562132e5':
      DEV-40319: Add new configuration support in helm chart

commit 0f49f00
Author: jeremy <[email protected]>
Date:   Tue Oct 23 21:02:30 2018 +0800

    DEV-40319: Add new configuration support in helm chart

commit 7788b7a
Merge: 453b400 19cb6d0
Author: Jeremy Tang <[email protected]>
Date:   Wed Oct 17 23:54:03 2018 -0700

    Merge pull request #2 in DEV/k8s-helm-charts from DEV-39795-support-specifying-an-escalation to develop

    * commit '19cb6d08103676af5b9b3cfcf6baf4de2b6853e9':
      DEV-39795: Support specifying an escalation chain for collectors
      DEV-39795: Support specifying an escalation chain for collectors

commit 19cb6d0
Author: jeremy <[email protected]>
Date:   Thu Oct 18 10:01:44 2018 +0800

    DEV-39795: Support specifying an escalation chain for collectors

commit e13a688
Author: jeremy <[email protected]>
Date:   Tue Oct 16 10:44:25 2018 +0800

    DEV-39795: Support specifying an escalation chain for collectors

commit 453b400
Merge: e7d0aeb 0069c29
Author: Jeremy Tang <[email protected]>
Date:   Sun Oct 14 22:56:23 2018 -0700

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

    * commit '0069c29ebac9b26de692b3690c136fefd091e0ff':
      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-39965: Allow the user to specify a parent group during installation

commit 0069c29
Author: jeremy <[email protected]>
Date:   Fri Oct 12 15:09:10 2018 +0800

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

commit ddae67a
Author: jeremy <[email protected]>
Date:   Fri Oct 12 14:24:47 2018 +0800

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

commit 7c92de6
Author: jeremy <[email protected]>
Date:   Fri Oct 12 10:10:15 2018 +0800

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

* DEV-59118: Updated kubeversion constraint to include pre-release
versions also

Co-authored-by: jeremy <[email protected]>
Co-authored-by: dzxiao <[email protected]>
Co-authored-by: vaibhav.kumbhar <[email protected]>
Co-authored-by: Pranay Lonkar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant