feat:Add load filtering to clusterLogConfig and exclude namespaces #643

LeiZhang-Hunter · 2023-10-25T02:49:36Z

Proposed Changes:

Which issue(s) this PR fixes:

Fixes #

Additional documentation:

为clusterLogConfig加了很多新特性，可以排除命名空间，可以根据不同的Deployment，CronJob，Statsetfulset，Daemonset 去过滤pod

过滤命名空间

apiVersion: loggie.io/v1beta1
kind:  ClusterLogConfig
metadata:
  name: globalstdout
spec:
  selector:
    type: pod
    namespaceSelector:
      - default1
      - default2
    excludeNameSpaceSelector:
      - default3
  pipeline:
    sources: |
      - type: file
        name: stdout
        paths:
        - stdout
    sinkRef: default

选择负载

apiVersion: loggie.io/v1beta1
kind:  ClusterLogConfig
metadata:
  name: globalstdout
spec:
  selector:
    type: workload
    workload_selector:
      - type: 
          - Deployment
        nameSelector:
          - my-nginx
        nameSpaceSelector:
          - default
       
  pipeline:
    sources: |
      - type: file
        name: stdout
        paths:
        - stdout
    sinkRef: default

ethfoo · 2023-11-06T11:34:43Z

pkg/discovery/kubernetes/helper/pods_filter.go

+	return selector, nil
+}
+
+// GetPodsByLabelSelector 根据label 筛选出全部的pod


注释都改成英文？

ethfoo · 2023-11-08T09:31:53Z

pkg/discovery/kubernetes/apis/loggie/v1beta1/clusterlogconfig_types.go

+	PodSelector       `json:",inline"`
+	NodeSelector      `json:",inline"`
+	NamespaceSelector `json:",inline"`
+	WorkloadSelector  []WorkloadSelector `json:"workload_selector,omitempty"`


改成驼峰的方式？

ethfoo · 2023-11-08T09:32:21Z

pkg/discovery/kubernetes/helper/filter_cache_checker.go

+
+func (p *filterCacheChecker) checkOwner(owner metav1.OwnerReference, namespace string) (bool, error) {
+
+	// 如果没有选workloadSelector，那么默认是全部符合的


ethfoo · 2023-11-08T09:32:42Z

pkg/discovery/kubernetes/helper/pod_confirm.go

+	}
+}
+
+// Confirm 确认pod 是否满足lgc的规则


ethfoo · 2023-11-08T09:32:49Z

pkg/discovery/kubernetes/helper/pod_confirm.go

+		return false, nil
+	}
+
+	// 检查label


ethfoo · 2023-11-08T09:33:00Z

pkg/discovery/kubernetes/helper/pods_filter.go

+	return ret, nil
+}
+
+// Filter 过滤pod


ethfoo · 2023-11-08T09:33:12Z

pkg/discovery/kubernetes/helper/pods_filter.go

+	return selector, nil
+}
+
+// GetPodsByLabelSelector select pod by label


LeiZhang-Hunter added 4 commits October 25, 2023 10:42

feat:Add load filtering to clusterLogConfig and exclude namespaces

5092593

feat:Add load filtering to clusterLogConfig and exclude namespaces

aa7dcce

feat:Add load filtering to clusterLogConfig and exclude namespaces

54e7907

feat:Add load filtering to clusterLogConfig and exclude namespaces

3d79036

ethfoo reviewed Nov 6, 2023

View reviewed changes

feat:Add load filtering to clusterLogConfig and exclude namespaces

009143f

ethfoo reviewed Nov 8, 2023

View reviewed changes

pkg/discovery/kubernetes/helper/pod_confirm.go Outdated

}

}

// Confirm 确认pod 是否满足lgc的规则

Copy link

Collaborator

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

英文

ethfoo reviewed Nov 8, 2023

View reviewed changes

pkg/discovery/kubernetes/helper/pod_confirm.go Outdated

return false, nil

}

// 检查label

Copy link

Collaborator

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

英文

ethfoo reviewed Nov 8, 2023

View reviewed changes

pkg/discovery/kubernetes/helper/pods_filter.go Outdated

return ret, nil

}

// Filter 过滤pod

Copy link

Collaborator

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

英文

ethfoo reviewed Nov 8, 2023

View reviewed changes

pkg/discovery/kubernetes/helper/pods_filter.go

return selector, nil

}

// GetPodsByLabelSelector select pod by label

Copy link

Collaborator

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

英文

feat:Add load filtering to clusterLogConfig and exclude namespaces

4a118a1

ethfoo merged commit 7d03ad8 into loggie-io:main Nov 9, 2023
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat:Add load filtering to clusterLogConfig and exclude namespaces #643

feat:Add load filtering to clusterLogConfig and exclude namespaces #643

LeiZhang-Hunter commented Oct 25, 2023

ethfoo Nov 6, 2023

ethfoo Nov 8, 2023

ethfoo Nov 8, 2023

ethfoo Nov 8, 2023

ethfoo Nov 8, 2023

ethfoo Nov 8, 2023

ethfoo Nov 8, 2023


		func (p *filterCacheChecker) checkOwner(owner metav1.OwnerReference, namespace string) (bool, error) {

		// 如果没有选workloadSelector，那么默认是全部符合的

feat:Add load filtering to clusterLogConfig and exclude namespaces #643

feat:Add load filtering to clusterLogConfig and exclude namespaces #643

Conversation

LeiZhang-Hunter commented Oct 25, 2023

Proposed Changes:

Which issue(s) this PR fixes:

Additional documentation:

ethfoo Nov 6, 2023

Choose a reason for hiding this comment

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

ethfoo Nov 8, 2023

Choose a reason for hiding this comment

ethfoo Nov 8, 2023

Choose a reason for hiding this comment