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

Commit 477017c

Browse files
vkumbhar94kaladaLM18pranay-lonkar-logicmonitorlmvaibhavkjeremy
authored
Develop (#186)
* fix linter issue * update remove unneeded param, change func name to initSyncHPA * Update comment for HasHorizontalPodAutoscalerPermissions * DEV-59446 fixed deleted namespaces present on portal issue * DEV-59446 delete namespace code refactored * add dupl comments * DEV-59446 delete namespace code refactored * Milestone 3.0.1 Changes (#135) * Merge pull request #49 in DEV/k8s-argus from bugfix/DEV-59446-deleted-namespaces-are-still-present-on-the-portal to develop * commit 'd0fb53894f1475979f48653c6438318faa3085b0': DEV-59446 delete namespace code refactored DEV-59446 delete namespace code refactored DEV-59446 fixed deleted namespaces present on portal issue * Merge pull request #47 in DEV/k8s-argus from DEV-59276-argus-dev-prof to develop * commit 'e1c57b89b13dd22fa949f1ca7db2672f9e29874e': DEV-59276: Created dev profile dockerfile and updated makefile with dev profile Co-authored-by: vaibhav.kumbhar <[email protected]> * DEV-60985 argus failed to add device for collectorset-controller when csc restarts * DEV-61833: DEV-61833: Gosec scan fixes - avoiding taking reference of object created by range * Gosec fixes (#138) * DEV-39965: Allow the user to specify a parent group during installation * DEV-39965: Allow the user to specify a parent group during installation * DEV-40505: Sync the k8s resource to santaba when argus launches * DEV-40434: The alert status of Pods and Services are disabled * DEV-40505: Sync the k8s resource to santaba when argus launches * DEV-40505: Sync the k8s resource to santaba when argus launches * DEV-40779: Enable the alert on service group when it is created by argus * DEV-41432: Use IP as hostname for argus related devices * DEV-41432: Use IP as hostname for argus related devices * DEV-41459: Add a new device type for k8s devices * DEV-41432: Use IP as hostname for argus related devices * DEV-40217: Support to set log levels and improve logs in argus related projects * DEV-40217: Support to set log levels and improve logs in argus related projects * DEV-41682: Improve the argus code for the CI failure in GitHub * Dev-40217 support to set log levels and improve Dev-40217 support to set log levels and improve * DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated * DEV-41947: Improve the initsync logic to prevent lost data after k8s device is updated * DEV-42060: Don't create collector device for Kubernetes Clusters * DEV-47062 Add distinguishing property to host network pods * DEV-49046 Fix the internal IP cannot found bug in argus * DEV-49046 Fix the internal IP cannot found bug in argus * Update node_test.go * DEV-48974 Upgrade Argus from golang 1.9 to 1.11 * DEV-48974 Upgrade Argus from golang 1.9 to 1.11 * DEV-49251 improve panic log process * DEV-50734 Support all service type, and add the logs * DEV-41301 Upgrade the go sdk to v2 * DEV-41301 Upgrade the go sdk to v2 * DEV-41301 Upgrade the go sdk to v2 * DEV-41301 Upgrade the go sdk to v2 * DEV-50734 Support all service type, modify the UpdateFunc * DEV-41301 Upgrade the go sdk to v2 * DEV-50929 Add k8s deployments monitoring by Argus * DEV-49251 Add the defer to initSync and improve log output * DEV-41301 Upgrade the go sdk to v2 * DEV-50929 Improve the code with comments * DEV-50734 Improve the log message * DEV-49251 Improve the log message * DEV-49251 Improve the comments * DEV-51405 Fix the argus log format * DEV-51567 Fixed the label value of k8s monitored * DEV-49675 Synchronous develop branch, add the recover panic logic for deployments * Modify the format by Travis CI check * DEV-51677 Improve the code according to github comments * Improve the variable naming * DEV-51932 fix uptime widget for k8s resources * DEV-49675 Restore the dockerfile * DEV-52508 Fixed the CI check * DEV-52508 Argus deployment rbac privilege improve * DEV-52508 Argus deployment rbac privilege improve * DEV-51952 Research argus http & http proxy configuration options * DEV-51952 Research argus http & http proxy configuration options * DEV-52508 Argus deployment rbac privilege compatibility improvement * DEV-52508 Argus deployment rbac privilege compatibility improvement * DEV-52508 Argus deployment rbac privilege compatibility improvement * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52508 Improve by the comments * DEV-52508 Fix the comments * DEV-52508 Fix the comments * DEV-52044 Add http proxy for argus * remove logo link * DEV-52044 Add http proxy for argus * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52044 Add httpURL parameter description * DEV-52044 Add httpURL parameter description * DEV-52044 Fix the comments * DEV-52044 Fix the comments * DEV-52036 Fix the comments * DEV-52044 Improve the http proxy configuration * DEV-52044 Improve the http proxy configuration * DEV-52036 Fix the comments * DEV-52991 Add UT * DEV-52692 fix the comments * DEV-52692 fix the comments * DEV-52692 Support proxy for dockerized collector * DEV-53516 Create PR for supporting http proxy configuration * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * feature/upgrade: updated k8s sdk to 1.17 and client-go library to 14.0. and gosdk to 1.14 updated respective vendor packages accordingly * DEV-58267: updated v1betv2 client to v1 for deployment watcher. * Updated Golang sdk version to 1.14.1 * DEV-58755: Updated image tag to new series i.e. v2latest * DEV-59276: Created dev profile dockerfile and updated makefile with dev profile * DEV-59446 fixed deleted namespaces present on portal issue * DEV-59446 delete namespace code refactored * DEV-59446 delete namespace code refactored * DEV-61833: DEV-61833: Gosec scan fixes - avoiding taking reference of object created by range Co-authored-by: jeremy <[email protected]> Co-authored-by: Jeff <[email protected]> Co-authored-by: JeremyTangCD <[email protected]> Co-authored-by: dzxiao <[email protected]> Co-authored-by: vaibhav.kumbhar <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Pranay Lonkar <[email protected]> * DEV-60985 added following changes to fix csc restart issue moved grpcConn and cscClient at central place moved collectorID fetch logic in utilities removed cscClient from Manager struct device.go and modified some methods signatures * DEV-55576: Implemented periodic discovery having 5 min resync period, im-mem device cache to reduce calls on portal * DEV-60985 argus failed to add device for collectorset-controller when csc restarts * added unit test cases for functions * DEV-60985 refactored code - argus failed to add device for collectorset-controller when csc restarts * DEV-55576: changes cache run signature * DEV-60985 retry logic for gRPC connection argus failed to add device for collectorset-controller when csc restarts * DEV-60985 retry logic for gRPC connection argus failed to add device for collectorset-controller when csc restarts * DEV-60985 refactored code - argus failed to add device for collectorset-controller when csc restarts * DEV-60985 added cron job to handle gRPC connection * DEV-60985 moved connection cron job to connection package * unit tests added for device and builder files. * DEV-60985 removed cron job and added go routine * DEV-61404- refactor * DEV-61404- fixed build failure * DEV-61404- removed newly added test files and added them to separate PR. * DEV-61404- added unit test cases for device,builder,utilities and namespace files * DEV-61404- Added testCase names in failure error strings. * Argus 3.1.0 dev (#140) * argus-3.1.0: Merge pull request #53 in DEV/k8s-argus from DEV-55576-periodic-discovery to develop * commit '9dc837c9d6e7257cdef929fc0c230cc671f0a245': DEV-55576: changes cache run signature DEV-55576: Implemented periodic discovery having 5 min resync period, im-mem device cache to reduce calls on portal * Merge pull request #51 in DEV/k8s-argus from bugfix/DEV-60985-collector-controller-set-pod-once-delete-from-k8s-restarts-but-does-not-reflect-in to develop * commit '090bd71b7a75b1068ea9f6c132d9f5cbbc18c096': DEV-60985 removed cron job and added go routine DEV-60985 moved connection cron job to connection package DEV-60985 added cron job to handle gRPC connection DEV-60985 refactored code - argus failed to add device for collectorset-controller when csc restarts DEV-60985 retry logic for gRPC connection DEV-60985 retry logic for gRPC connection DEV-60985 refactored code - argus failed to add device for collectorset-controller when csc restarts DEV-60985 argus failed to add device for collectorset-controller when csc restarts DEV-60985 added following changes to fix csc restart issue DEV-60985 argus failed to add device for collectorset-controller when csc restarts Co-authored-by: Vaibhav Kumbhar <[email protected]> * DEV-61404- removed unwanted file from commit * DEV-61404- correct key name for propertymap * DEV-61404-removed commented code * DEV-62227: Refactored code in worker model way. * DEV-62227: removing unused code * DEV-62227: replaced struct to interface * DEV-62227: replaced worker config with interface references * DEV-62227: moved log methods of lmcontext to log package, moved config log level looker to log package * DEV-62227: added package comment and moved log context update to log package * DEV-62227: renamed method name to new * DEV-62229: Unit test fixes * DEV-62229: lm sdk modified to return rate limit headers * DEV-62229: rate limiter handling implemented * DEV-62229: method name changed * DEV-62229: incorporated review comments * DEV-62229: incorporated review comments, restructured rate limit manager and added comments * DEV-62229: updated 429 error with http status code constant * DEV-63522: Changed node applies to function to use labels * DEV-63522: updated deleted device group applies to also * DEV-63945-implementation of discovery filtering. * DEV-63945-logging type modifications. * DEV-63845- fixed build failures. * DEV-63945- implemented update filter scenario. * DEV-63945- added unit test cases and address review comments. * DEV-63945- toml file changes. * DEV-63945- review comments. * DEV-63945-review comments addressed. * DEV-63945- reverted incorrect changes from lm-sdk. * V4.0.0 changes 2 (#143) * v4.0.0-changes: Merge pull request #54 in DEV/k8s-argus from DEV-61404-argus-golang-unit-testing to develop * commit 'da37a8c5b2e1068696aaf6e9402c245b567e8f21': DEV-61404-removed commented code DEV-61404- removed newly added test files and added them to separate PR. DEV-61404- fixed build failure DEV-61404- refactor unit tests added for device and builder files. added unit test cases for functions * v4.0.0-changes: Merge pull request #55 in DEV/k8s-argus from DEV-61404-argus-unitTests-part2 to develop * commit '7e4d77f3646155996d482548d306f4ba8fd6b92a': DEV-61404- correct key name for propertymap DEV-61404- removed unwanted file from commit DEV-61404- Added testCase names in failure error strings. DEV-61404- added unit test cases for device,builder,utilities and namespace files * v4.0.0-changes: Merge pull request #58 in DEV/k8s-argus from feature/rate-limiter-handling to develop * commit '76519b23376fcfc35f8c26ca56563e487f30a668': DEV-62229: updated 429 error with http status code constant DEV-62229: incorporated review comments, restructured rate limit manager and added comments DEV-62229: incorporated review comments DEV-62229: method name changed DEV-62229: rate limiter handling implemented DEV-62229: lm sdk modified to return rate limit headers DEV-62229: Unit test fixes DEV-62227: renamed method name to new DEV-62227: added package comment and moved log context update to log package DEV-62227: moved log methods of lmcontext to log package, moved config log level looker to log package DEV-62227: replaced worker config with interface references DEV-62227: replaced struct to interface DEV-62227: removing unused code DEV-62227: Refactored code in worker model way. * v4.0.0-changes: Merge pull request #59 in DEV/k8s-argus from DEV-63522-node-groups to develop * commit '7721cfb45932d3722ab86ba40483559bdc0c4d14': DEV-63522: Changed node applies to function to use labels * v4.0.0-changes: Merge pull request #60 in DEV/k8s-argus from DEV-63522-node-groups to develop * commit '72138e0b071df8a19b792d176c425e764336d8c0': DEV-63522: updated deleted device group applies to also Co-authored-by: Shubhashri Shirode <[email protected]> Co-authored-by: Vaibhav Kumbhar <[email protected]> * DEV-63945- fixed issue with invalid keys in expression. * removed uncaught conflict * DEV-63945-unit test for back slash. * DEV-63945-formatting. * DEV-64472- handled back slash value in labelKey for evaluating filtering expression. * DEV-64472-handled characters which are not supported by govaluate library. * DEV-64472-corrected typo. * DEV-64223-implemented periodic delete for dangling resources. * DEV-64911: Handling regex error parse * DEV-64908-fixed hpa implementation as per new code structure. * feature/DEV-64908: added worker channel for hpa * go-mod: migrate repository to go mod * go-mod: recreate vendor with go.mod * go-mod: Update vendor * go-mod: run tidy and recreate go.sum * DEV-64395 log k8s version and helm chart details in clsuter device group * DEV-64395 cron job run at midnight * DEV-64395 moved GetNamespaceList to namespce file * index-bound: Merge pull request #66 in DEV/k8s-argus from DEV-64911-regex-error to develop (#146) * commit '8499bc7ca25b5ddb59f79b9f05e8ccd10d2fc167': DEV-64911: Handling regex error parse Co-authored-by: Vaibhav Kumbhar <[email protected]> * DEV-64223- changed func name and context in logging. * DEV-64395 refactored code and added some test cases * DEV-64395 refactored code * Discovery filtering implementation (#148) * Merge pull request #61 in DEV/k8s-argus from feature/DEV-63945-discovery-filtering-processing to develop * commit 'a48049878a5e5e73b45a15bdbe0944f8db5c9d25': DEV-63945- reverted incorrect changes from lm-sdk. DEV-63945-review comments addressed. DEV-63945- review comments. DEV-63945- toml file changes. DEV-63945- added unit test cases and address review comments. DEV-63945- implemented update filter scenario. DEV-63845- fixed build failures. DEV-63945-logging type modifications. DEV-63945-implementation of discovery filtering. * Merge pull request #63 in DEV/k8s-argus from feature/DEV-63945-discovery-filtering-processing to develop * commit '598c1c3ea572eccef0883ecf1a4959e9689e45de': DEV-63945-formatting. DEV-63945-unit test for back slash. DEV-63945- fixed issue with invalid keys in expression. * Merge pull request #64 in DEV/k8s-argus from bugfix/DEV-64472-handle-slash-in-labelKeys-discoveryFiltering to develop * commit '5be90882900d06901b847e6a487749a166c819b3': DEV-64472-corrected typo. DEV-64472-handled characters which are not supported by govaluate library. DEV-64472- handled back slash value in labelKey for evaluating filtering expression. Co-authored-by: Shubhashri Shirode <[email protected]> * DEV-64395 read helm chart details from configmap annotations * DEV-64395 refatored cron job code * DEV-64395 refactored code * DEV-53897- Updated displayName for Pods by appending respective namespace. * DEV-64395 refactored code * DEV-65158: converted for kind of loop to do while * DEVTS-9220 fixed system.ips property issue in add device functionality * DEVTS-9220 fixed system.ips property issue * Release-4.2.0 (#150) * Merge pull request #68 in DEV/k8s-argus from go-mod-migration to develop * commit 'ee8c356b1eb3cc8632488bfae9eff1cfb833a490': go-mod: run tidy and recreate go.sum go-mod: Update vendor go-mod: recreate vendor with go.mod go-mod: migrate repository to go mod * Merge pull request #65 in DEV/k8s-argus from feature/DEV-64223-periodic-delete to develop * commit '7d5deebf0bfec0c2e7d453dcabe468c51fdc13ab': DEV-64223- changed func name and context in logging. DEV-64223-implemented periodic delete for dangling resources. * Merge pull request #69 in DEV/k8s-argus from feature/DEV-64395-log-k8s-and-helm-version-for-argus-pods to develop * commit '2bf1008f8446adf3d1ce3068d7a32561235e3048': DEV-64395 refactored code DEV-64395 refactored code DEV-64395 refatored cron job code DEV-64395 read helm chart details from configmap annotations DEV-64395 refactored code DEV-64395 refactored code and added some test cases DEV-64395 moved GetNamespaceList to namespce file DEV-64395 cron job run at midnight DEV-64395 log k8s version and helm chart details in clsuter device group * Merge pull request #71 in DEV/k8s-argus from feature/DEV-53897-duplicate-resouce-in-different-namespace to develop * commit 'c9d888b8c817ac1f15b333ff4cb8f713b3e0801e': DEV-53897- Updated displayName for Pods by appending respective namespace. * Merge pull request #72 in DEV/k8s-argus from DEV-65158-grpc-conn to develop * commit 'db685c9a175b72381bf6ac6069e81c0c0d0002eb': DEV-65158: converted for kind of loop to do while * Merge pull request #73 in DEV/k8s-argus from bugfix/DEVTS-9220-discovered-kubernetes-pods-are-alerting-on-ping-k8s-datasource-and-host-status to develop * commit '6332f3054996997fa1ea1926abb4866a60f73922': DEVTS-9220 fixed system.ips property issue DEVTS-9220 fixed system.ips property issue in add device functionality * resolved build issue Co-authored-by: Vaibhav Kumbhar <[email protected]> Co-authored-by: Shubhashri Shirode <[email protected]> Co-authored-by: Pranay Lonkar <[email protected]> * DEV-65186: Fixed resource name and device name to displayname. Typically hpa name is same as that of its managing deployment. name conflicts stop us from adding hpa to lm * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs - added syntax highlighter * DEV-64397 updated docs - removed roadmap and device tree, added all helm config params * DEV-65186: added hpa discovery filtering * DEV-65186: Enable alerts on HPA * DEV-64397 updated docs * DEV-64397 updated docs * DEV-65940-Unique names for resources handling.. * DEV-65940- updating device cache on check n update call. * DEV-66059 added support for AWS Fargate * dev-vk: use logicmonitor lm-sdk-go v2 release lib, since logicmonitor lm-sdk-go tagged release is now available * DEV-65940- changed naming format to contain resourceType. * DEVTS-9598-Added support for filtering by resource name containing special characters. * dev-vk: format go files and imports * DEV-65940- Fixed unit test cases, issue related to auto deletion of resources on init-sync, address review comments. * DEV-65940- fixed build issue. * DEV-65940-corrected resourcetype. * dev-vk: removed vkumbhar94 from go mod * DEV-66613 fixed delete devices issue * DEV-65940-Handled multiple device conflict scenario and restricted resource naming only on argus restart. * DEV-65940- code refactor and fixed build issue * DEV-65940-golint issue fix. * DEV-65940- compile error resolved. * DEV-65940 - fixed lint issue. * DEV-65940-fixed issue with deployment type for same hostname * DEV-66613 removed unused method * DEV-65940-fixed issue with node resource type. Fixed issue with removing existing dynamic conflicts group devices in case of on conflicts. * DEV-65940- fixed build issue. * DEV-66613 placed resource deletion timestamp logic at central place * DEV-65940- fixed issue with moving devices to conflicts group. * DEV-66613 check if property exists with same value * DEV-65940- review comments * DEV-65940-removed unused code. * DEV-65940- fixed issue when fullname is enabled, existing conflicting devices were not getting removed from conflicts group. * dev-vk: Released custom lm-sdk-go version with rate limit header patch * dev-patch: update lm-sdk-go to newer version v2.0.0-argus2 wherein device patch is fixed * DEV-used update property api for updating system categories. * DEV-65940- fixed build failure. * DEV-65940- review comments fixed. * DEV-65940- added rate limit headers in lm-sdk-go. * DEV-66613 added Patch API for device update * DEV-66613 added Patch API for device update * DEV-65940- code refactor * DEV-65940- updated lm-sdk reference. * DEV-66613 add resource deletion timestamp * DEV-66613 refactored delete devices code * DEV-66613 trim name before appending uuid * DEV-66613 changed func name * DEV-66613 used Patch API to move deleted device * DEV-66613 resolved rename issue for deleted device * Dev 5.0.0 release (#152) * Modify the format by Travis CI check * DEV-51677 Improve the code according to github comments * Improve the variable naming * DEV-51932 fix uptime widget for k8s resources * DEV-49675 Restore the dockerfile * DEV-52508 Fixed the CI check * DEV-52508 Argus deployment rbac privilege improve * DEV-52508 Argus deployment rbac privilege improve * DEV-51952 Research argus http & http proxy configuration options * DEV-51952 Research argus http & http proxy configuration options * DEV-52508 Argus deployment rbac privilege compatibility improvement * DEV-52508 Argus deployment rbac privilege compatibility improvement * DEV-52508 Argus deployment rbac privilege compatibility improvement * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52508 Improve by the comments * DEV-52508 Fix the comments * DEV-52508 Fix the comments * DEV-52044 Add http proxy for argus * remove logo link * DEV-52044 Add http proxy for argus * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52036 Allow for duplicate pod names in one LM account * DEV-52044 Add httpURL parameter description * DEV-52044 Add httpURL parameter description * DEV-52044 Fix the comments * DEV-52044 Fix the comments * DEV-52036 Fix the comments * DEV-52044 Improve the http proxy configuration * DEV-52044 Improve the http proxy configuration * DEV-52036 Fix the comments * DEV-52991 Add UT * DEV-52692 fix the comments * DEV-52692 fix the comments * DEV-52692 Support proxy for dockerized collector * DEV-53516 Create PR for supporting http proxy configuration * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * DEV-55114 Argus shouldn't overwrite system.categories values * feature/upgrade: updated k8s sdk to 1.17 and client-go library to 14.0. and gosdk to 1.14 updated respective vendor packages accordingly * DEV-58267: updated v1betv2 client to v1 for deployment watcher. * Updated Golang sdk version to 1.14.1 * DEV-58755: Updated image tag to new series i.e. v2latest * DEV-59276: Created dev profile dockerfile and updated makefile with dev profile * add support for horizontalpodautoscaler resource * add HorizontalPodAutoscalerDeviceGroupName to device tree * use autoscaling/v1 * fix linter issue * update remove unneeded param, change func name to initSyncHPA * Update comment for HasHorizontalPodAutoscalerPermissions * DEV-59446 fixed deleted namespaces present on portal issue * DEV-59446 delete namespace code refactored * add dupl comments * DEV-59446 delete namespace code refactored * DEV-60985 argus failed to add device for collectorset-controller when csc restarts * DEV-61833: DEV-61833: Gosec scan fixes - avoiding taking reference of object created by range * DEV-60985 added following changes to fix csc restart issue moved grpcConn and cscClient at central place moved collectorID fetch logic in utilities removed cscClient from Manager struct device.go and modified some methods signatures * DEV-55576: Implemented periodic discovery having 5 min resync period, im-mem device cache to reduce calls on portal * DEV-60985 argus failed to add device for collectorset-controller when csc restarts * added unit test cases for functions * DEV-60985 refactored code - argus failed to add device for collectorset-controller when csc restarts * DEV-55576: changes cache run signature * DEV-60985 retry logic for gRPC connection argus failed to add device for collectorset-controller when csc restarts * DEV-60985 retry logic for gRPC connection argus failed to add device for collectorset-controller when csc restarts * DEV-60985 refactored code - argus failed to add device for collectorset-controller when csc restarts * DEV-60985 added cron job to handle gRPC connection * DEV-60985 moved connection cron job to connection package * unit tests added for device and builder files. * DEV-60985 removed cron job and added go routine * DEV-61404- refactor * DEV-61404- fixed build failure * DEV-61404- removed newly added test files and added them to separate PR. * DEV-61404- added unit test cases for device,builder,utilities and namespace files * DEV-61404- Added testCase names in failure error strings. * DEV-61404- removed unwanted file from commit * DEV-61404- correct key name for propertymap * DEV-61404-removed commented code * DEV-62227: Refactored code in worker model way. * DEV-62227: removing unused code * DEV-62227: replaced struct to interface * DEV-62227: replaced worker config with interface references * DEV-62227: moved log methods of lmcontext to log package, moved config log level looker to log package * DEV-62227: added package comment and moved log context update to log package * DEV-62227: renamed method name to new * DEV-62229: Unit test fixes * DEV-62229: lm sdk modified to return rate limit headers * DEV-62229: rate limiter handling implemented * DEV-62229: method name changed * DEV-62229: incorporated review comments * DEV-62229: incorporated review comments, restructured rate limit manager and added comments * DEV-62229: updated 429 error with http status code constant * DEV-63522: Changed node applies to function to use labels * DEV-63522: updated deleted device group applies to also * DEV-63945-implementation of discovery filtering. * DEV-63945-logging type modifications. * DEV-63845- fixed build failures. * DEV-63945- implemented update filter scenario. * DEV-63945- added unit test cases and address review comments. * DEV-63945- toml file changes. * DEV-63945- review comments. * DEV-63945-review comments addressed. * DEV-63945- reverted incorrect changes from lm-sdk. * DEV-63945- fixed issue with invalid keys in expression. * DEV-63945-unit test for back slash. * DEV-63945-formatting. * DEV-64472- handled back slash value in labelKey for evaluating filtering expression. * DEV-64472-handled characters which are not supported by govaluate library. * DEV-64472-corrected typo. * DEV-64223-implemented periodic delete for dangling resources. * DEV-64911: Handling regex error parse * DEV-64908-fixed hpa implementation as per new code structure. * feature/DEV-64908: added worker channel for hpa * go-mod: migrate repository to go mod * go-mod: recreate vendor with go.mod * go-mod: Update vendor * go-mod: run tidy and recreate go.sum * DEV-64395 log k8s version and helm chart details in clsuter device group * DEV-64395 cron job run at midnight * DEV-64395 moved GetNamespaceList to namespce file * DEV-64223- changed func name and context in logging. * DEV-64395 refactored code and added some test cases * DEV-64395 refactored code * DEV-64395 read helm chart details from configmap annotations * DEV-64395 refatored cron job code * DEV-64395 refactored code * DEV-53897- Updated displayName for Pods by appending respective namespace. * DEV-64395 refactored code * DEV-65158: converted for kind of loop to do while * DEVTS-9220 fixed system.ips property issue in add device functionality * DEVTS-9220 fixed system.ips property issue * DEV-65186: Fixed resource name and device name to displayname. Typically hpa name is same as that of its managing deployment. name conflicts stop us from adding hpa to lm * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs * DEV-64397 updated docs - added syntax highlighter * DEV-64397 updated docs - removed roadmap and device tree, added all helm config params * DEV-65186: added hpa discovery filtering * DEV-65186: Enable alerts on HPA * DEV-64397 updated docs * DEV-64397 updated docs * DEV-65940-Unique names for resources handling.. * DEV-65940- updating device cache on check n update call. * DEV-66059 added support for AWS Fargate * dev-vk: use logicmonitor lm-sdk-go v2 release lib, since logicmonitor lm-sdk-go tagged release is now available * DEV-65940- changed naming format to contain resourceType. * DEVTS-9598-Added support for filtering by resource name containing special characters. * dev-vk: format go files and imports * DEV-65940- Fixed unit test cases, issue related to auto deletion of resources on init-sync, address review comments. * DEV-65940- fixed build issue. * DEV-65940-corrected resourcetype. * dev-vk: removed vkumbhar94 from go mod * DEV-65940-Handled multiple device conflict scenario and restricted resource naming only on argus restart. * DEV-65940- code refactor and fixed build issue * DEV-65940-golint issue fix. * DEV-65940- compile error resolved. * DEV-65940 - fixed lint issue. * DEV-65940-fixed issue with deployment type for same hostname * DEV-65940-fixed issue with node resource type. Fixed issue with removing existing dynamic conflicts group devices in case of on conflicts. * DEV-65940- fixed build issue. * DEV-65940- fixed issue with moving devices to conflicts group. * DEV-65940- review comments * DEV-65940-removed unused code. * DEV-65940- fixed issue when fullname is enabled, existing conflicting devices were not getting removed from conflicts group. * dev-vk: Released custom lm-sdk-go version with rate limit header patch * dev-patch: update lm-sdk-go to newer version v2.0.0-argus2 wherein device patch is fixed * DEV-used update property api for updating system categories. * DEV-65940- fixed build failure. * DEV-65940- review comments fixed. * DEV-65940- added rate limit headers in lm-sdk-go. * DEV-65940- code refactor * DEV-65940- updated lm-sdk reference. * dev-5.0.0: Fixed conflicts Co-authored-by: Daizhong Xiao <[email protected]> Co-authored-by: JeremyCD <[email protected]> Co-authored-by: vaibhav.kumbhar <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Kalada Opuiyo <[email protected]> Co-authored-by: Pranay Lonkar <[email protected]> Co-authored-by: Shubhashri Shirode <[email protected]> * DEV-67526 default properties on device group * Merge pull request #88 in DEV/k8s-argus from feature/DEV-70008-add-across-cluster-conflicitng-devices to develop Squashed commit of the following: commit f419d3983582bfc97e25b63eaf645a29292c832f Author: Shubhashri Shirode <[email protected]> Date: Mon Jan 18 18:31:40 2021 +0530 DEV-70008- add across cluster conflicting devices with fullName to LM portal. * Merge pull request #88 in DEV/k8s-argus from feature/DEV-70008-add-across-cluster-conflicitng-devices to develop (#155) Squashed commit of the following: commit f419d3983582bfc97e25b63eaf645a29292c832f Author: Shubhashri Shirode <[email protected]> Date: Mon Jan 18 18:31:40 2021 +0530 DEV-70008- add across cluster conflicting devices with fullName to LM portal. Co-authored-by: Shubhashri Shirode <[email protected]> * test(*): Add mockgen lib and update build configs. Implement sample test suite Add mockgen go module and update required build configs. Implement test suite for pod.go Squashed commit of the following: commit 7da9a16510c1261872eb903a325a5698224c055d Author: vaibhav.kumbhar <[email protected]> Date: Tue Jan 19 18:00:23 2021 +0530 feature/dev-vk: removed gotest commit f062801de35a450bf7b25336621bc655e0d19d0d Author: vaibhav.kumbhar <[email protected]> Date: Fri Jan 15 13:19:28 2021 +0530 feature/dev-vk: rename test case name and add test case for empty pod ip commit e1e0f5ab0737e6814acba29047aeec51d3224649 Author: vaibhav.kumbhar <[email protected]> Date: Fri Jan 15 00:57:22 2021 +0530 feature/dev-vk: download mockgen in devsetup step commit dfc397f24de99ebc5f6b328cd28095d3fd88a7c9 Author: vaibhav.kumbhar <[email protected]> Date: Fri Jan 15 00:55:40 2021 +0530 feature/dev-vk: ignore gomock created files from gofmt commit 427af745d1094ad63ade6f6199f37822eb7fb0f9 Author: vaibhav.kumbhar <[email protected]> Date: Fri Jan 15 00:45:43 2021 +0530 feature/dev-vk: correct gofmt and goimport command commit 4f532f7de51f87ea8cdc4a5d7a826817ad7bc90f Author: vaibhav.kumbhar <[email protected]> Date: Fri Jan 15 00:31:19 2021 +0530 feature/dev-vk: Explored unit test framework which is awesome for golang to write unit test with mocking lib - mockgen, gomock * feat(watchers): generate SelfLink custom property on all devices As selfLink has stopped populating from k8s 1.20.0, Argus need to generate it now onwards. Logicmonitor considers selfLink as ERI (External resource identifier), used by TopologySources. Note that Version value used in self link will be the Client version using which object is retrieved from APIServer, hence version in self link and the actual resource version may differ. Squashed commit of the following: commit 4d89747849c25d2d6c3b07d4233e1bad8b182667 Author: vaibhav.kumbhar <[email protected]> Date: Mon Feb 8 18:27:02 2021 +0530 DEV-70451: remove temporaray added log stmts commit a46da912c93a0a1fce3df581b8aebab995583611 Author: vaibhav.kumbhar <[email protected]> Date: Mon Feb 8 18:22:58 2021 +0530 DEV-70451: feat(watchers): Generate SelfLink custom property on all devices As selfLink has stopped populating from k8s 1.20.0, Argus need to generate it now onwards. Logicmonitor considers selfLink as ERI (External resource identifier), used by TopologySources. Note that Version value used in self link will be the Client version using which object is retrieved from APIServer, hence version in self link and the actual resource version may differ. * DEV-67526 feat(deleteDevices) default properties Add default properties on cluster device group * DEV-67526 feat(deleteDevices) default properties Added PropertyBuilder for adding properties on device group * Merge pull request #90 in DEV/k8s-argus from DEV-68258-argus-local-dev-set-up-toggle-option-for-non-ssl-communication to develop Squashed commit of the following: commit 792ad06b917ba627d56dec1c156645dde17ab7f7 Author: nehapatil <[email protected]> Date: Wed Feb 17 17:11:55 2021 +0530 DEV-68258: reverted the changes in connection.go and lm_sdk_go_client.go commit b217b1632a57684fb251388a12f1a831ea534f4d Author: nehapatil <[email protected]> Date: Tue Feb 2 16:03:47 2021 +0530 DEV-68258: removed sysouts and changed variable to ignore_ssl commit 4ec78905abeb47475fb261e30c5c18ff543150b1 Author: nehapatil <[email protected]> Date: Mon Feb 1 13:28:28 2021 +0530 DEV-68258: added a new flag in config.go and modified argus.go * Merge pull request #93 in DEV/k8s-argus from DEV-67526-configurable-termination-of-k8s-resources-through-argus to develop Squashed commit of the following: commit 544446714b055fbe2246b518f919c380e7d71302 Author: Pranay Lonkar <[email protected]> Date: Tue Feb 23 15:16:43 2021 +0530 DEV-67526 nolint maligned commit 8c54f58801e6cd53531a72bfcd79980110d2c4aa Author: Pranay Lonkar <[email protected]> Date: Tue Feb 23 13:15:10 2021 +0530 DEV-67526 code lint commit 3dee1f6d8f77a75ea27481cd17a2887b8f1a7db0 Author: Pranay Lonkar <[email protected]> Date: Tue Feb 23 13:03:30 2021 +0530 DEV-67526 feat(deleteDevices) code refactored * Merge pull request #95 in DEV/k8s-argus from bugfix/DEV-72789-corrected-deviceCacheEntry to develop Squashed commit of the following: commit ed001877d88f943c686064caad4677453656a3eb Author: Shubhashri Shirode <[email protected]> Date: Wed Mar 3 14:52:14 2021 +0530 DEV-72789:fix:added log statements commit 3b797593e118b5cb66be683273ca28f7b0c8aa2e Author: Shubhashri Shirode <[email protected]> Date: Wed Mar 3 11:02:05 2021 +0530 DEV-72789:fix:removed commented code. commit c89d9dea80568e8c8a4d2e3251dec21c92f3e477 Author: Shubhashri Shirode <[email protected]> Date: Wed Mar 3 11:00:04 2021 +0530 DEV-72789:fix:corrected device cache entry to take full device name. * feat(headless-services): set hostname to "name-res-namespace" ClusterIP parameter in headless service configuration holds value "None" which leads to hostname conflicts in Logicmonitor devices. Set hostname to service's unique name within cluster i.e. name-resource-namespace format to avoid conflicts Note: Logicmonitor already recommend not to use hostname in datasources Squashed commit of the following: commit 62f2d3f50dfa6d999bde992cc9cb582c27fb9aeb Author: vaibhav.kumbhar <[email protected]> Date: Fri Mar 5 17:28:56 2021 +0530 DEV-72902: set name-resource-namespace as hostname for headless services commit 538e455134f851d84595f34e2edcca0abcc31d86 Author: vaibhav.kumbhar <[email protected]> Date: Fri Mar 5 17:11:20 2021 +0530 DEV-72902: add comment commit dd122987a77ad2b7730470f15a77700f6ad7f4a9 Author: vaibhav.kumbhar <[email protected]> Date: Fri Mar 5 16:46:05 2021 +0530 DEV-72902: set fullname when clusterip is none * feat(argus app version): log argus app version log argus app version in the cluster device group custom properties for better troubleshooting Squashed commit of the following: commit 9934ee3ced228989dc817d03912336ea502cb165 Author: Pranay Lonkar <[email protected]> Date: Tue Mar 9 13:21:23 2021 +0530 DEV-72980: log argus app version * feat(device-group-props): allow users to mention device group properties User can add device group properties in helm charts to add custom properties on device groups. Users can edit the property value to start the required functionality. They can also provide the input to allow overriding the property. If override is set to false, property will only be added once and the property value will be updated only if it is empty. Squashed commit of the following: commit b12b7536a9e5a8547ed825210ede8832c7202813 Author: vaibhav.kumbhar <[email protected]> Date: Thu Mar 11 11:28:47 2021 +0530 lint fixes commit dc34be81800010a68f0c7db221ba97f5619ec63f Author: vaibhav.kumbhar <[email protected]> Date: Thu Mar 11 10:52:47 2021 +0530 feature/DEV-72076: fix(dgprop): take user input to override device group property Override param defaults to true. If override is set to false, prop will only be added once, not updated afterwards except existing property value is empty commit ad916c07b6cb98effc0ccad894da9b85fc8527b9 Author: nehapatil <[email protected]> Date: Tue Mar 9 18:10:40 2021 +0530 feature/DEV-72076: DEV-72076: read the properties and add them to respective device groups * feat(externalized-intervals): Read periodic sync, periodic delete and cache resync intervals from configMap. Squashed commit of the following: commit 243f50547857f8679e3fc15c353b6b305acf3a82 Author: Shubhashri Shirode <[email protected]> Date: Thu Mar 25 12:03:51 2021 +0530 DEV-70963- added getter methods for intervals. commit a643bac7959056806790cb7779f59fda12b9a4c6 Author: Shubhashri Shirode <[email protected]> Date: Wed Mar 24 15:33:01 2021 +0530 DEV-70963- corrected warning message for invalid config values. commit 0c9c6ccbe317817b8d7215fa733527d60f9ffc93 Author: Shubhashri Shirode <[email protected]> Date: Tue Mar 23 20:13:57 2021 +0530 DEV-70963: refactor commit 5fcb276ebdf99ff982feff72dc0c55610bbe6da2 Author: Shubhashri Shirode <[email protected]> Date: Tue Mar 23 14:39:20 2021 +0530 DEV-70963: code refactor as per review comments. commit 2ee52f275e01dc8324e738642442b12bee0c9000 Merge: 0529dcd5a f56d22301 Author: Shubhashri Shirode <[email protected]> Date: Tue Mar 16 16:39:31 2021 +0530 Merge branch 'develop' into feature/DEV-70963-externalized-intervals # Conflicts: # pkg/config/config.go commit 0529dcd5a0cfe6ff4b1fdcd844c6d27494d31477 Author: Shubhashri Shirode <[email protected]> Date: Fri Mar 12 18:59:30 2021 +0530 DEV-70963-handling min values for intervals. commit e209b2e00328a73391825b75cf71c31419149d25 Author: Shubhashri Shirode <[email protected]> Date: Tue Mar 9 16:28:53 2021 +0530 DEV-70963:feat:updated default values for periodic sync and periodic delete intervals. commit 518f5f505acfd6775d444d64febd4fbfac02aa76 Merge: 0baf142cd efabf2069 Author: Shubhashri Shirode <[email protected]> Date: Tue Mar 9 16:18:02 2021 +0530 feat: Merge branch 'develop' into feature/DEV-70963-externalized-intervals # Conflicts: # pkg/config/config.go commit 0baf142cdd9e5ee8aff320fdda2e01b3aecfdbf6 Author: Shubhashri Shirode <[email protected]> Date: Tue Feb 16 18:16:01 2021 +0530 DEV-70963:feat(externalising app intervals) code refactor. commit 4e21d5dd3a7da8d541f8e1624e9624bb54602187 Author: Shubhashri Shirode <[email protected]> Date: Sat Feb 13 08:44:08 2021 +0530 DEV-70963:feat:fixed build errors. commit 8815881515a2656ddc70f6e6581ac6d089e84fbf Author: Shubhashri Shirode <[email protected]> Date: Fri Feb 12 19:03:54 2021 +0530 DEV-70963 feat: Read periodic sync, periodic delete and cache resync intervals from configMap. * fix(hpa): set hostname in name-resource-namespace format for HPA HPA resources in different namespaces having the same name are creating hostname conflict issues. To avoid it, set the hostname to HPA's unique name within the cluster i.e. "name-resource-namespace" format. Note: LogicMonitor already recommends not to use the hostname in DataSources. Squashed commit of the following: commit 5365293a79e76630de24586e8dd919ccc293bd03 Author: Pranay Lonkar <[email protected]> Date: Tue Mar 30 14:52:52 2021 +0530 DEV-74059: set hostname to name-res-namespace for HPA * fix(externalized-intervals): set default values for intervals If the user upgrades Argus without using the latest helm chart then periodic sync will run continuously. To avoid it, set the default value for periodic sync, periodic delete, and cache resync intervals. Squashed commit of the following: commit ae361747a4a5e4f490bf1b7feb169726faaec9ef Author: Pranay Lonkar <[email protected]> Date: Wed Mar 31 12:41:12 2021 +0530 DEV-70963: set default values for intervals commit 4839fff749f181f40ac2983ad6de271de94df798 Merge: 46a1f77d3 e3b91379c Author: Pranay Lonkar <[email protected]> Date: Tue Mar 30 18:31:42 2021 +0530 Merge branch 'develop' into bugfix/DEV-70963-externalised-periodic-discovery-deletion-and-cache-sync-interval-into-config-map commit 46a1f77d3493583d35709582f9f04e8fb24e16ec Author: Pranay Lonkar <[email protected]> Date: Tue Mar 30 18:29:20 2021 +0530 DEV-70963: set default values for intervals * fix(device group): fetch device groups by parentId and name fetch device groups by parentId and name as previously it was fetching by name only so it was creating an issue if there are many device groups by the same name Squashed commit of the following: commit 2de998d7f8407d3f4f9380ff294e53750fb512b2 Author: Pranay Lonkar <[email protected]> Date: Fri Apr 9 19:24:27 2021 +0530 DEV-74705: error log statement commit 65481c2b700d32f1e2645e447b1e53299130c7df Author: Pranay Lonkar <[email protected]> Date: Fri Apr 9 18:35:59 2021 +0530 DEV-74705: fetch device group by parentId * fix(namespace groups): add namespace groups If namespace group is failed to add under any resource group then add it under remaining resource groups Squashed commit of the following: commit 5f6bbebd0dca5be35a4cf48008516ef60ad6a960 Author: Pranay Lonkar <[email protected]> Date: Wed Apr 14 16:55:04 2021 +0530 DEV-74704: add namespace groups * fix(empty-devicename): Added check for empty device name. Squashed commit of the following: commit c2646f592a3f7dc24097e2a91a6152c3e4589693 Author: Shubhashri Shirode <[email protected]> Date: Fri May 7 17:56:47 2021 +0530 DEVTS-10495: fixed review comments. commit 7b8778f5255209e13318e8523dbf87170fb019dd Author: Shubhashri Shirode <[email protected]> Date: Thu May 6 14:31:20 2021 +0530 DEVTS-10495:review comments fixed. commit 371284d4e721c56bcb9fa80eda0e1b1f5df3cef7 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 19:31:22 2021 +0530 DEVTS-10495:corrected log formats. commit 4f289798400cea963c30c2e9e72c5a72ab7fa2e4 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 19:16:07 2021 +0530 DEVTS-10495:corrected typo. commit 8e0cf7e2c366f067778a7ed9dcb770b3fde43f55 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 19:15:00 2021 +0530 DEVTS-10495:calculated latency for delete event. commit 8940a30ab1218af2fc564ceab0c4f19768beb143 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 17:23:01 2021 +0530 corrected error log. commit dc5b81ce0eb3795f0c46a7dddc109fe233d04dff Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 16:44:12 2021 +0530 fix(empty-resource-name):Adde ed check for empty resource name. * travis-build file update * typo corrected. * fixed build error * Release 5.1.2 (#165) * feat(release 5.1.2) -Improved retrieving of device group by using its parentId. - add device group even though any of the device group add API call fails. -added check for empty device name before sending update call to santaba. * fix(discovery filtering during update): Add discovery filtering handling during device update Squashed commit of the following: commit 7a84ff60e0ec1092450c86719d37af16f9fdf8ef Author: Shubhashri Shirode <[email protected]> Date: Wed Jun 23 10:36:02 2021 +0530 DEVTS-10872: Corrected device exists in cache flow condition. commit 74bf09702491f81a174bf38e4944a37b19b4e8e4 Author: Shubhashri Shirode <[email protected]> Date: Tue Jun 22 10:46:33 2021 +0530 DEVTS-10872:Correct cache entry while deleting the devices. commit 0ee8fc6e73cb03111e4d81e6f73f60cd710edb5b Author: Shubhashri Shirode <[email protected]> Date: Mon Jun 21 18:42:06 2021 +0530 DEVTS-10872: added check for if device exists in cache. commit 289db71e38a8e46ab95ad09e8c7525e6f4eff8a5 Author: Shubhashri Shirode <[email protected]> Date: Mon Jun 21 14:33:13 2021 +0530 DEVTS-10872:review comments fixed. commit 3bcb51b5a5b224f63742d52697bddcde6214ae36 Author: Shubhashri Shirode <[email protected]> Date: Tue Jun 15 11:53:45 2021 +0530 DEVTS-10872- review comments commit 140a8a903603a7a1a10018bb68e901fcbf589da3 Author: Shubhashri Shirode <[email protected]> Date: Fri Jun 11 12:20:37 2021 +0530 DEVTS-10872: Refactor commit bade58070297b6a7d377d1acd7863c6d9b21cf20 Author: Shubhashri Shirode <[email protected]> Date: Thu Jun 10 19:03:56 2021 +0530 DEVTS-10872- Added discovery filtering in device update calls. * fix(IP resync): Graceful and periodic resync of Pods in case of IP mismatch Squashed commit of the following: commit 76f711ba9d4ea9b732b81dbf1e0f2a9bde4185ba Author: Shubhashri Shirode <[email protected]> Date: Tue Jun 29 13:10:36 2021 +0530 DEVTS-10791: error handling. commit b0521d11bae64f599203291a74abf021b953a25e Author: Shubhashri Shirode <[email protected]> Date: Mon Jun 28 16:07:44 2021 +0530 DEVTS-10791: Refactor retry logic for updating IP address commit 31946a91defdecdd25f45dc368586b0f1232a276 Author: Shubhashri Shirode <[email protected]> Date: Fri Jun 25 18:35:27 2021 +0530 DEVTS-10791: added delay until system.ips prop is updated commit ac8f4fa1279909c4fb5500f9dc79b48c4542063f Author: Shubhashri Shirode <[email protected]> Date: Wed Jun 23 12:16:40 2021 +0530 DEVTS-10791: incorrect IP address handling Co-authored-by: shubhashri12 <[email protected]> Co-authored-by: Shubhashri Shirode <[email protected]> * Release 6.0.0 beta (#169) * fix(device group): fetch device groups by parentId and name fetch device groups by parentId and name as previously it was fetching by name only so it was creating an issue if there are many device groups by the same name Squashed commit of the following: commit 2de998d7f8407d3f4f9380ff294e53750fb512b2 Author: Pranay Lonkar <[email protected]> Date: Fri Apr 9 19:24:27 2021 +0530 DEV-74705: error log statement commit 65481c2b700d32f1e2645e447b1e53299130c7df Author: Pranay Lonkar <[email protected]> Date: Fri Apr 9 18:35:59 2021 +0530 DEV-74705: fetch device group by parentId * Added docker token for travis build. * passed image version param in script * fix(namespace groups): add namespace groups If namespace group is failed to add under any resource group then add it under remaining resource groups Squashed commit of the following: commit 5f6bbebd0dca5be35a4cf48008516ef60ad6a960 Author: Pranay Lonkar <[email protected]> Date: Wed Apr 14 16:55:04 2021 +0530 DEV-74704: add namespace groups * feat(argus metrics): expose Argus metrics endpoint read openmetrics config from ConfigMap & expose Argus metrics endpoint Squashed commit of the following: commit 971aa68701add95ce9c49ded1804f595eb623938 Author: Pranay Lonkar <[email protected]> Date: Wed Apr 14 20:25:59 2021 +0530 DEV-74282: add log fatal and change port var type commit 3a72ebc3a3c522d03b0d2cb22bf5abfd2ff0bb28 Merge: 96f956b1d c5947d84b Author: Pranay Lonkar <[email protected]> Date: Wed Apr 14 17:05:40 2021 +0530 Merge branch 'develop' into feature/DEV-74282-argus-setting-up-the-infrastructure-for-exposing-the-metrics commit 96f956b1db4f7adcdf8ba0ba8fe7974672282141 Author: Pranay Lonkar <[email protected]> Date: Wed Apr 7 16:59:13 2021 +0530 DEV-74282: added comment on config commit de1b264e7bebf957a357f21da4cd2e621de73ee2 Author: Pranay Lonkar <[email protected]> Date: Wed Apr 7 15:37:05 2021 +0530 DEV-74282: expose metrics endpoint * fix(empty-devicename): Added check for empty device name. Squashed commit of the following: commit c2646f592a3f7dc24097e2a91a6152c3e4589693 Author: Shubhashri Shirode <[email protected]> Date: Fri May 7 17:56:47 2021 +0530 DEVTS-10495: fixed review comments. commit 7b8778f5255209e13318e8523dbf87170fb019dd Author: Shubhashri Shirode <[email protected]> Date: Thu May 6 14:31:20 2021 +0530 DEVTS-10495:review comments fixed. commit 371284d4e721c56bcb9fa80eda0e1b1f5df3cef7 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 19:31:22 2021 +0530 DEVTS-10495:corrected log formats. commit 4f289798400cea963c30c2e9e72c5a72ab7fa2e4 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 19:16:07 2021 +0530 DEVTS-10495:corrected typo. commit 8e0cf7e2c366f067778a7ed9dcb770b3fde43f55 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 19:15:00 2021 +0530 DEVTS-10495:calculated latency for delete event. commit 8940a30ab1218af2fc564ceab0c4f19768beb143 Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 17:23:01 2021 +0530 corrected error log. commit dc5b81ce0eb3795f0c46a7dddc109fe233d04dff Author: Shubhashri Shirode <[email protected]> Date: Wed May 5 16:44:12 2021 +0530 fix(empty-resource-name):Adde ed check for empty resource name. * feat(*): improve application performance in terms of LM calls, etc Redesign argus code structure and improve each code part of argus BREAKING CHANGE: Changes argus behaviour Squashed commit of the following: commit 11a40f02f6272a7a612f48c745b98acd040ab147 Author: vaibhav.kumbhar <[email protected]> Date: Mon May 24 13:20:22 2021 +0530 dev-vk: config watcher started commit ba72ced69de04792b6775359984fc2f472d784b1 Author: vaibhav.kumbhar <[email protected]> Date: Mon May 24 12:32:12 2021 +0530 dev-vk: constant access levels changed commit 938cf1eed13fa934351cfaaa721a089514f9c1d5 Author: vaibhav.kumbhar <[email protected]> Date: Thu May 20 14:59:45 2021 +0530 dev-vk: removed dead code commit 2010ffe9f9a78d28823ba35ce2f74f20ea7785ca Author: vaibhav.kumbhar <[email protected]> Date: Wed May 19 19:09:35 2021 +0530 dev-vk: removed dead code from device manager commit 15ee349268bc263bf55c8053a34c79d87f99fbe8 Merge: 38e772527 3da07d11b Author: vaibhav.kumbhar <[email protected]> Date: Wed May 19 18:23:33 2021 +0530 Merge branch 'develop' into dev-vk-refactoring commit 38e772527d91d14ca803a05a0c74addb76612bb5 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 18 20:09:28 2021 +0530 dev-vk: config load backward compatible commit b48b224fa2d97b16f83d3dae64c74e6b6d426de5 Author: vaibhav.kumbhar <[email protected]> Date: Thu May 13 14:58:44 2021 +0530 dev-vk: mod commit 6a1d5bb9dd1b13fe32494a4fbd685e850d28d9c7 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 21:14:52 2021 +0530 dev-vk: remove managed fields from event context commit 7147fcdc5cca8eddf4d38372418bfb00cf46fbc2 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 16:29:47 2021 +0530 dev-vk: something commit dfe3825fdd24ad72351594e1746ee2f69cda6468 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 09:06:33 2021 +0530 dev-vk: which tool commit 652ff9a2a58ba197219395a86db7c133a0c1605b Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 08:43:11 2021 +0530 dev-vk: import improval commit 006042ee62c945aa4da1ae30aefe8282867ebc87 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 00:36:57 2021 +0530 dev-vk: something commit b42175b13859e783489802d592aa5805287c24a9 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 00:21:11 2021 +0530 dev-vk: local runner commit f29c122ae93d61e9d891203f774c1465c25dcaed Author: vaibhav.kumbhar <[email protected]> Date: Wed May 12 00:05:30 2021 +0530 dev-vk: linters commit 078fe7d3dac5c16bbbc0bcb3f7b67242c4214372 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 11 20:53:02 2021 +0530 dev-vk: fixed something commit e21f5aa24df049b302bd50ab15c50264f13c8bf7 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 11 14:14:29 2021 +0530 dev-vk: goroutine id in log context commit b2858101b850de0fb52149d201bba5c4858e0c83 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 11 00:02:45 2021 +0530 dev-vk: resolve conflict commit ba9fa133161755326c2d6750065a3e8ac8f7dc0c Merge: 70710b8c2 44fb38a8f Author: vaibhav.kumbhar <[email protected]> Date: Mon May 10 22:42:10 2021 +0530 Merge branch 'develop' into dev-vk-refactoring commit 70710b8c2949703c77c5b4de5a272ae03ed96fc5 Author: vaibhav.kumbhar <[email protected]> Date: Mon May 10 16:10:51 2021 +0530 dev-vk: template, port, multiline lint command commit bd8281b91151dc505483e59478ab6c846069b42d Author: vaibhav.kumbhar <[email protected]> Date: Mon May 10 14:58:38 2021 +0530 dev-vk: new changes ... and 4 more commits * feat(argus): remove resource conflicts handling do not create conflicts group do not add conflicts category on any resource Squashed commit of the following: commit 48f3d53aafc8c92997da20631bb23a659f0f6fc6 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 26 13:13:45 2021 +0530 dev-vk: something new commit 4fc2aa68c675a6734f3228d9590dae902aeb38c0 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 25 18:16:23 2021 +0530 dev-vk: func name renamed commit 4ab6fe32fdaa0d728156ff99fd23bad35e978b45 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 25 17:59:19 2021 +0530 dev-vk: unused constants commit 1419c01161cb6afb1a5f478472746c51dd7f0cfd Author: vaibhav.kumbhar <[email protected]> Date: Tue May 25 17:45:23 2021 +0530 dev-vk: conflicts grp removed commit 7458501a4b44a28f3fe4a4020e4e25f9fbaaacf5 Author: vaibhav.kumbhar <[email protected]> Date: Tue May 25 11:51:53 2021 +0530 dev-vk: unused remove * feat(argus): remove conflict category on upgrade resolve conflicts gracefully Squashed commit of the following: commit 3102993e707307c703315db00c5ef5252dea0da6 Author: vaibhav.kumbhar <[email protected]> Date: Wed May 26 15:53:02 2021 +0530 dev-vk: remove conflicts category while upgrading * fix(old-cache-impl): remove old cache impl Remove DeviceCache struct implementation Squashed commit of the following: commit bb7499d925e4e62c209e90eadf82a5713143cd80 Author: vaibhav.kumbhar <[email protected]> Date: Thu May 27 12:52:34 2021 +0530 dev-vk: linter fix commit 4aae32cf19618da43213992760481955e3222597 Author: vaibhav.kumbhar <[email protected]> Date: Thu May 27 11:49:51 2021 +0530 dev-vk: dead code - remove old cache impl * feat(watcher-handlers): don't update previous resource using UID match Correlate UID match while updating the resource. If UID does not match, argus will first try to delete previous resource and add new resource. Squashed commit of the following: commit 7ad12cad0f5d4271e4e9ace697b2430a56cb2ee3 Author: vaibhav.kumbhar <[email protected]> Date: Tue Jun 1 10:31:56 2021 +0530 dev-vk: comments commit 56382f58798830399a7664da21e50329995e501c Author: vaibhav.kumbhar <[email protected]> Date: Mon May 31 14:52:30 2021 +0530 dev-vk: something commit 700224eba0a1eaecf81fa69b55bd8fd3b3f8d4b7 Author: vaibhav.kumbhar <[email protected]> Date: Mon May 31 13:17:53 2021 +0530 dev-vk: mark delete init sync commit a7d429ae8e9e69adad2af482ebb3d32d13ae5b46 Author: vaibhav.kumbhar <[email protected]> Date: Sun May 30 00:08:45 2021 +0530 dev-vk: dev-vk: uid match for correlation and ignore updating prev resource * refactor(gomodguard): enable gomodguard to block and allow modules block yaml v2 library block spew library as it considered log flooder as it dumps all fields of object Squashed commit of the following: commit 1080ce6e957987fb2b96198077fd3cfe372b0073 Author: Vaibhav Kumbhar <[email protected]> Date: Wed Jun 2 20:24:53 2021 +0530 dev-vk: block spew commit ba783823c07942dbf867db47946eb510e1532bac Author: Vaibhav Kumbhar <[email protected]> Date: Wed Jun 2 18:29:56 2021 +0530 dev-vk: gomodguard config moved to golangci commit 734443fd463eb7680ebf093b5a46b553c881f777 Author: vaibhav.kumbhar <[email protected]> Date: Wed Jun 2 13:59:56 2021 +0530 dev-vk: gomodguard config in golangci-lint config * feat(*): improve resource group performance handle resource group apis to backoff and retry apis on rate limit thresholds Squashed commit of the following: commit 047467d28828ac018df6dd18dfc8b74bef902b5e Author: Vaibhav Kumbhar <[email protected]> Date: Thu Jul 1 00:21:14 2021 +0530 dev-vk: update cache commit c4b3e446ae9c6207ba11f14d6baa49295e3cb2b1 Author: Vaibhav Kumbhar <[email protected]> Date: Thu Jul 1 00:14:56 2021 +0530 dev-vk: review comments commit aa3e843e59b38f22358968135befebf0b68b4d5c Author: Vaibhav Kumbhar <[email protected]> Date: Wed Jun 30 08:35:16 2021 +0530 dev-vk: timeout commit 0f2cdb69dc1f0e356e05b8b52fd6b66fe799ac27 Author: Vaibhav Kumbhar <[email protected]> Date: Tue Jun 29 15:47:41 2021 +0530 dev-vk: sleep commit 458b78530184306969a2d7da16e258f975f9343b Author: Vaibhav Kumbhar <[email protected]> Date: Tue Jun 29 15:41:17 2021 +0530 dev-vk: defer commit 38e44f7a8fc4d84be78c4e3596ee328e2bb876dc Author: Vaibhav Kumbhar <[email protected]> Date: Tue Jun 29 15:29:09 2021 +0530 dev-vk: bug commit 6ec2d57bee539d00984f70984bd0f22d18516894 Author: Vaibhav Kumbhar <[email protected]> Date: Tue Jun 29 15:19:37 2021 +0530 dev-vk: revierw comments commit a5d2ca8f8542a32b6a71044e0d8269e30d29ea71 Author: Vaibhav Kumbhar <[email protected]> Date: Tue Jun 29 14:58:44 2021 +0530 dev-vk: defauls sync times commit 41c3492e8333fcafe0e2ecd785b7ce6027ded6e1 Author: Vaibhav Kumbhar <[email protected]> Date: Tue Jun 29 12:15:08 2021 +0530 dev-vk: more commit 8a3ab93d267798fcb3c4bf05c1d0119b73500532 Author: Vaibhav Kumbhar <[email protected]> Date: Thu Jun 24 22:21:18 2021 +0530 dev-vk: as commit bff07dac1d065dd39f9cf5a581bbe5886c69ebc7 Author: Vaibhav Kumbhar <[email protected]> Date: Thu Jun 24 16:36:31 2021 +0530 dev-vk: something commit b02711c32f001f3b97fcdedf7e450a1888da3988 Author: Vaibhav Kumbhar…
1 parent b6770b5 commit 477017c

File tree

4 files changed

+40
-5
lines changed

4 files changed

+40
-5
lines changed

‎pkg/resourcecache/rebuilder.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ func (rc *ResourceCache) accumulateDeviceCache(lctx *lmctx.LMContext, inChan <-c
180180
log.Debugf("New cache map : %v", store)
181181
}
182182

183+
// nolint: cyclop
183184
func (rc *ResourceCache) storeDevice(lctx *lmctx.LMContext, resourceObj *models.Device, clusterName string, store *Store) bool {
184185
log := lmlog.Logger(lctx)
185186
if resourceObj == nil ||
@@ -213,6 +214,15 @@ func (rc *ResourceCache) storeDevice(lctx *lmctx.LMContext, resourceObj *models.
213214
return false
214215
}
215216

217+
if emeta, ok := store.Exists(lctx, key, meta.Container); ok && emeta.LMID != meta.LMID {
218+
if emeta.CreatedOn > meta.CreatedOn {
219+
emeta.Container += "-dupl"
220+
store.Set(lctx, key, emeta)
221+
} else {
222+
meta.Container += "-dupl"
223+
}
224+
}
225+
216226
store.Set(lctx, key, meta)
217227
return true
218228
}

‎pkg/sync/initsyncer.go‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,28 @@ func (i *InitSyncer) Sync(lctx *lmctx.LMContext) {
7373
list := i.ResourceManager.GetResourceCache().List()
7474
log.Tracef("Current cache: %v", list)
7575

76+
log.Infof("Deleting duplicate resources if any")
77+
for _, entry := range list {
78+
log.Tracef("Iterate resource cache entry : %v ", entry)
79+
cacheResourceName := entry.K
80+
cacheResourceMeta := entry.V
81+
82+
if ignoreSync[cacheResourceName.Resource] || cacheResourceName.Resource == enums.Namespaces {
83+
continue
84+
}
85+
86+
if strings.HasSuffix(cacheResourceMeta.Container, "-dupl") {
87+
childLctx := lmlog.LMContextWithFields(lctx, logrus.Fields{
88+
"name": cacheResourceName.Resource.FQName(cacheResourceName.Name),
89+
"type": cacheResourceName.Resource.Singular(),
90+
"ns": cacheResourceMeta.Container,
91+
"event": "sync",
92+
})
93+
childLctx = childLctx.LMContextWith(map[string]interface{}{constants.PartitionKey: fmt.Sprintf("%s-%s", cacheResourceName.Resource.String(), cacheResourceName.Name)})
94+
i.deleteResource(childLctx, cacheResourceName, cacheResourceMeta)
95+
}
96+
}
97+
7698
for _, entry := range list {
7799
log.Tracef("Iterate resource cache entry : %v ", entry)
78100
cacheResourceName := entry.K
@@ -102,10 +124,9 @@ func (i *InitSyncer) Sync(lctx *lmctx.LMContext) {
102124
if !ok ||
103125
clusterPresentMeta.UID != cacheResourceMeta.UID ||
104126
(conf.RegisterGenericFilter && !util.EvaluateExclusion(clusterPresentMeta.Labels)) {
105-
106-
i.deleteResource(childLctx, log, cacheResourceName, cacheResourceMeta)
127+
i.deleteResource(childLctx, cacheResourceName, cacheResourceMeta)
107128
} else if resolveConflicts {
108-
i.resolveConflicts(childLctx, cacheResourceMeta, clusterPresentMeta, cacheResourceName, log)
129+
i.resolveConflicts(childLctx, cacheResourceMeta, clusterPresentMeta, cacheResourceName)
109130
}
110131
}
111132

@@ -140,7 +161,8 @@ func (i *InitSyncer) deleteNamespace(allK8SResourcesStore *resourcecache.Store,
140161
}
141162

142163
// nolint: gocognit
143-
func (i *InitSyncer) resolveConflicts(lctx *lmctx.LMContext, cacheMeta types.ResourceMeta, clusterResourceMeta types.ResourceMeta, cacheResourceName types.ResourceName, log *logrus.Entry) {
164+
func (i *InitSyncer) resolveConflicts(lctx *lmctx.LMContext, cacheMeta types.ResourceMeta, clusterResourceMeta types.ResourceMeta, cacheResourceName types.ResourceName) {
165+
log := lmlog.Logger(lctx)
144166
rt := cacheResourceName.Resource
145167
if clusterResourceMeta.DisplayName != cacheMeta.DisplayName || cacheMeta.HasSysCategory(rt.GetConflictsCategory()) {
146168
conf, err := config.GetConfig(lctx)
@@ -171,7 +193,8 @@ func (i *InitSyncer) resolveConflicts(lctx *lmctx.LMContext, cacheMeta types.Res
171193
}
172194
}
173195

174-
func (i *InitSyncer) deleteResource(lctx *lmctx.LMContext, log *logrus.Entry, resourceName types.ResourceName, resourceMeta types.ResourceMeta) {
196+
func (i *InitSyncer) deleteResource(lctx *lmctx.LMContext, resourceName types.ResourceName, resourceMeta types.ResourceMeta) {
197+
log := lmlog.Logger(lctx)
175198
conf, err := config.GetConfig(lctx)
176199
if err != nil {
177200
log.Errorf("Failed to get config")

‎pkg/types/common.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ type ResourceMeta struct {
4444
Labels map[string]string `json:"labels"`
4545
SysCategories []string `json:"sys_categories"`
4646
UID k8stypes.UID `json:"uid"`
47+
CreatedOn int64 `json:"created_on"`
4748
}
4849

4950
func (resourceMeta ResourceMeta) HasSysCategory(category string) bool {

‎pkg/utilities/utilities.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ func GetResourceMetaFromResource(resource *models.Device) (types.ResourceMeta, e
173173
Labels: labels,
174174
SysCategories: categories,
175175
UID: k8stypes.UID(GetResourcePropertyValue(resource, constants.K8sResourceUIDPropertyKey)),
176+
CreatedOn: resource.CreatedOn,
176177
}, nil
177178
}
178179

0 commit comments

Comments
 (0)