-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added Logging configuration to telemetry-operator
- Loading branch information
Showing
23 changed files
with
1,250 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| --- | ||
| apiVersion: apiextensions.k8s.io/v1 | ||
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.11.1 | ||
| creationTimestamp: null | ||
| name: loggings.telemetry.openstack.org | ||
| spec: | ||
| group: telemetry.openstack.org | ||
| names: | ||
| kind: Logging | ||
| listKind: LoggingList | ||
| plural: loggings | ||
| singular: logging | ||
| scope: Namespaced | ||
| versions: | ||
| - name: v1beta1 | ||
| schema: | ||
| openAPIV3Schema: | ||
| description: Logging is the Schema for the loggings API | ||
| properties: | ||
| apiVersion: | ||
| description: 'APIVersion defines the versioned schema of this representation | ||
| of an object. Servers should convert recognized schemas to the latest | ||
| internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
| type: string | ||
| kind: | ||
| description: 'Kind is a string value representing the REST resource this | ||
| object represents. Servers may infer this from the endpoint the client | ||
| submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
| type: string | ||
| metadata: | ||
| type: object | ||
| spec: | ||
| description: LoggingSpec defines the desired state of Logging | ||
| properties: | ||
| cloNamespace: | ||
| default: openshift-logging | ||
| description: CLONamespace points to the namespace where the cluster-logging-operator | ||
| is deployed | ||
| type: string | ||
| ipaddr: | ||
| description: IPAddr is the address where the service will listen on | ||
| type: string | ||
| network: | ||
| description: The openstack network that will be used to connect computes | ||
| nodes | ||
| type: string | ||
| nodeSetName: | ||
| description: NodeSetName specifies the OpenStackDataPlaneNodeSet name | ||
| for the edpm nodes we want logging enabled | ||
| type: string | ||
| port: | ||
| default: 10514 | ||
| description: Port is the port where the service will listen on | ||
| format: int32 | ||
| type: integer | ||
| protocol: | ||
| default: TCP | ||
| description: 'The protocol of the connection the Service will listen | ||
| on: tcp or upd' | ||
| enum: | ||
| - TCP | ||
| - UDP | ||
| type: string | ||
| rsyslogPersistInterval: | ||
| default: 10 | ||
| description: The number of seconds between sending log attempts | ||
| format: int32 | ||
| type: integer | ||
| rsyslogQueueSize: | ||
| default: 10000 | ||
| description: The size of the local queue of logs | ||
| format: int32 | ||
| type: integer | ||
| rsyslogQueueType: | ||
| default: linkedList | ||
| description: The type of the local queue of logs | ||
| enum: | ||
| - fixedArray | ||
| - linkedList | ||
| - direct | ||
| - disk | ||
| type: string | ||
| rsyslogRetries: | ||
| default: 100 | ||
| description: The number of retries rsyslog will attempt before abandoning | ||
| format: int32 | ||
| type: integer | ||
| targetPort: | ||
| default: 10514 | ||
| description: TargetPort is the port where the logging syslog receiver | ||
| is listening | ||
| type: integer | ||
| required: | ||
| - ipaddr | ||
| - network | ||
| type: object | ||
| status: | ||
| description: LoggingStatus defines the observed state of Logging | ||
| properties: | ||
| conditions: | ||
| description: Conditions | ||
| items: | ||
| description: Condition defines an observation of a API resource | ||
| operational state. | ||
| properties: | ||
| lastTransitionTime: | ||
| description: Last time the condition transitioned from one status | ||
| to another. This should be when the underlying condition changed. | ||
| If that is not known, then using the time when the API field | ||
| changed is acceptable. | ||
| format: date-time | ||
| type: string | ||
| message: | ||
| description: A human readable message indicating details about | ||
| the transition. | ||
| type: string | ||
| reason: | ||
| description: The reason for the condition's last transition | ||
| in CamelCase. | ||
| type: string | ||
| severity: | ||
| description: Severity provides a classification of Reason code, | ||
| so the current situation is immediately understandable and | ||
| could act accordingly. It is meant for situations where Status=False | ||
| and it should be indicated if it is just informational, warning | ||
| (next reconciliation might fix it) or an error (e.g. DB create | ||
| issue and no actions to automatically resolve the issue can/should | ||
| be done). For conditions where Status=Unknown or Status=True | ||
| the Severity should be SeverityNone. | ||
| type: string | ||
| status: | ||
| description: Status of the condition, one of True, False, Unknown. | ||
| type: string | ||
| type: | ||
| description: Type of condition in CamelCase. | ||
| type: string | ||
| required: | ||
| - lastTransitionTime | ||
| - status | ||
| - type | ||
| type: object | ||
| type: array | ||
| hash: | ||
| additionalProperties: | ||
| type: string | ||
| description: Map of hashes to track e.g. job status | ||
| type: object | ||
| type: object | ||
| type: object | ||
| served: true | ||
| storage: true | ||
| subresources: | ||
| status: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| /* | ||
| Copyright 2022. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1beta1 | ||
|
|
||
| import ( | ||
| condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| // NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized. | ||
|
|
||
| // LoggingSpec defines the desired state of Logging | ||
| type LoggingSpec struct { | ||
|
|
||
| // The openstack network that will be used to connect computes nodes | ||
| // +kubebuilder:validation:Required | ||
| Network string `json:"network"` | ||
|
|
||
| // IPAddr is the address where the service will listen on | ||
| // +kubebuilder:validation:Required | ||
| IPAddr string `json:"ipaddr"` | ||
|
|
||
| // NodeSetName specifies the OpenStackDataPlaneNodeSet name for the edpm nodes we want logging enabled | ||
| // +kubebuilder:validation:Required | ||
| NodeSetName string `json:"nodeSetName,omitempty"` | ||
|
|
||
| // Port is the port where the service will listen on | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:default=10514 | ||
| Port int32 `json:"port,omitempty"` | ||
|
|
||
| // TargetPort is the port where the logging syslog receiver is listening | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:default=10514 | ||
| TargetPort int `json:"targetPort,omitempty"` | ||
|
|
||
| // The protocol of the connection the Service will listen on: tcp or upd | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:validation:Enum=TCP;UDP | ||
| // +kubebuilder:default:=TCP | ||
| Protocol string `json:"protocol,omitempty"` | ||
|
|
||
| // CLONamespace points to the namespace where the cluster-logging-operator is deployed | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:default=openshift-logging | ||
| CLONamespace string `json:"cloNamespace,omitempty"` | ||
|
|
||
| // The number of retries rsyslog will attempt before abandoning | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:default=100 | ||
| RsyslogRetries int32 `json:"rsyslogRetries,omitempty"` | ||
|
|
||
| // The type of the local queue of logs | ||
| // +kubebuilder:validation:Enum=fixedArray;linkedList;direct;disk | ||
| // +kubebuilder:default=linkedList | ||
| RsyslogQueueType string `json:"rsyslogQueueType,omitempty"` | ||
|
|
||
| // The size of the local queue of logs | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:default=10000 | ||
| RsyslogQueueSize int32 `json:"rsyslogQueueSize,omitempty"` | ||
|
|
||
| // The number of seconds between sending log attempts | ||
| // +kubebuilder:validation:Optional | ||
| // +kubebuilder:default=10 | ||
| RsyslogPersistInterval int32 `json:"rsyslogPersistInterval,omitempty"` | ||
|
|
||
| } | ||
|
|
||
| // LoggingStatus defines the observed state of Logging | ||
| type LoggingStatus struct { | ||
| // Map of hashes to track e.g. job status | ||
| Hash map[string]string `json:"hash,omitempty"` | ||
|
|
||
| // Conditions | ||
| Conditions condition.Conditions `json:"conditions,omitempty" optional:"true"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
| //+kubebuilder:subresource:status | ||
|
|
||
| // Logging is the Schema for the loggings API | ||
| type Logging struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
|
||
| Spec LoggingSpec `json:"spec,omitempty"` | ||
| Status LoggingStatus `json:"status,omitempty"` | ||
| } | ||
|
|
||
| //+kubebuilder:object:root=true | ||
|
|
||
| // LoggingList contains a list of Logging | ||
| type LoggingList struct { | ||
| metav1.TypeMeta `json:",inline"` | ||
| metav1.ListMeta `json:"metadata,omitempty"` | ||
| Items []Logging `json:"items"` | ||
| } | ||
|
|
||
| func init() { | ||
| SchemeBuilder.Register(&Logging{}, &LoggingList{}) | ||
| } | ||
|
|
||
| // RbacConditionsSet - set the conditions for the rbac object | ||
| func (instance Logging) RbacConditionsSet(c *condition.Condition) { | ||
| instance.Status.Conditions.Set(c) | ||
| } | ||
|
|
||
| // RbacNamespace - return the namespace | ||
| func (instance Logging) RbacNamespace() string { | ||
| return instance.Namespace | ||
| } | ||
|
|
||
| // RbacResourceName - return the name to be used for rbac objects (serviceaccount, role, rolebinding) | ||
| func (instance Logging) RbacResourceName() string { | ||
| return "telemetry-" + instance.Name | ||
| } |
Oops, something went wrong.