Skip to content

Support for cassandra as matrics store #6

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.

Sign up for GitHub

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

Merged
digiserg merged 3 commits into from
Feb 18, 2025
Merged

Support for cassandra as matrics store #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03e1ded
Support for cassandra as matrics store
digiserg Feb 15, 2025
924cec7
Update example
digiserg Feb 15, 2025
e85d352
Shorten name
digiserg Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions api/v1beta1/axonopscassandra_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ type AxonOpsCassandraCluster struct {
Image ContainerImage `json:"image,omitempty"`
Replicas int `json:"replicas,omitempty"`
ClusterName string `json:"clusterName,omitempty"`
DC string `json:"dc,omitempty"`
PersistentVolume PersistentVolumeSpec `json:"persistentVolume,omitempty"`
JavaOpts string `json:"javaOpts,omitempty"`
HeapSize string `json:"heapSize,omitempty"`
Expand Down Expand Up @@ -89,12 +90,14 @@ type AxonOpsDashboard struct {
// AxonOpsServer defines the dashboard
type AxonOpsServer struct {
// Container image definition with repository and tag
Image ContainerImage `json:"image,omitempty"`
Annotations map[string]string `json:"annotations,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
Env []EnvVars `json:"env,omitempty"`
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
PullPolicy string `json:"pullPolicy,omitempty"`
Image ContainerImage `json:"image,omitempty"`
Annotations map[string]string `json:"annotations,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
Env []EnvVars `json:"env,omitempty"`
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
PullPolicy string `json:"pullPolicy,omitempty"`
CassandraMetricsEnabled bool `json:"cassandraMetricsEnabled,omitempty"`
CassandraMetricsCluster AxonOpsCassandraCluster `json:"cassandraMetricsCluster,omitempty"`
}

// AxonOpsServer defines the dashboard
Expand Down
1 change: 1 addition & 0 deletions api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions apps/axon-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,16 @@ type ServerConfig struct {
}

func GenerateServerConfig(cfg cassandraaxonopscomv1beta1.AxonOpsCassandra) (*appsv1.StatefulSet, error) {
if cfg.Spec.AxonOps.Server.CassandraMetricsEnabled {
cfg.Spec.AxonOps.Server.Env = append(cfg.Spec.AxonOps.Server.Env, cassandraaxonopscomv1beta1.EnvVars{
Name: "CQL_HOSTS",
Value: "ca-metrics-" + cfg.GetName(),
})
cfg.Spec.AxonOps.Server.Env = append(cfg.Spec.AxonOps.Server.Env, cassandraaxonopscomv1beta1.EnvVars{
Name: "CQL_LOCAL_DC",
Value: "axonops1",
})
}
config := ServerConfig{
Name: cfg.GetName(),
Namespace: cfg.GetNamespace(),
Expand Down
56 changes: 29 additions & 27 deletions apps/cassandra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
- name: CASSANDRA_ENDPOINT_SNITCH
value: GossipingPropertyFileSnitch
- name: CASSANDRA_DC
value: dc1
value: {{ .DC }}
- name: CASSANDRA_RACK
value: rack1
- name: CASSANDRA_BROADCAST_RPC_ADDRESS
Expand Down Expand Up @@ -279,6 +279,7 @@ type CassandraConfig struct {
Replicas int
Image string
ClusterName string
DC string
JavaOpts string
HeapSize string
StorageSize string
Expand All @@ -293,28 +294,29 @@ type CassandraConfig struct {
PullPolicy string
}

func GenerateCassandraConfig(cfg cassandraaxonopscomv1beta1.AxonOpsCassandra) (*appsv1.StatefulSet, error) {
func GenerateCassandraConfig(name string, namespace string, storageSize string, storageClass string, cfg cassandraaxonopscomv1beta1.AxonOpsCassandraCluster) (*appsv1.StatefulSet, error) {
config := CassandraConfig{
Name: cfg.GetName(),
Namespace: cfg.GetNamespace(),
Replicas: utils.ValueOrDefaultInt(cfg.Spec.Cassandra.Replicas, 1),
Name: name,
Namespace: namespace,
Replicas: utils.ValueOrDefaultInt(cfg.Replicas, 1),
Image: fmt.Sprintf("%s:%s",
utils.ValueOrDefault(cfg.Spec.Cassandra.Image.Repository, defaultCassandraImage),
utils.ValueOrDefault(cfg.Spec.Cassandra.Image.Tag, defaultCassandraTag),
utils.ValueOrDefault(cfg.Image.Repository, defaultCassandraImage),
utils.ValueOrDefault(cfg.Image.Tag, defaultCassandraTag),
),
ClusterName: utils.ValueOrDefault(cfg.Spec.Cassandra.ClusterName, cfg.GetName()),
JavaOpts: utils.ValueOrDefault(cfg.Spec.Cassandra.JavaOpts, "-Xms512m -Xmx512m"),
StorageSize: utils.ValueOrDefault(cfg.Spec.AxonOps.Elasticsearch.PersistentVolume.Size, ""),
StorageClass: utils.ValueOrDefault(cfg.Spec.AxonOps.Elasticsearch.PersistentVolume.StorageClass, ""),
HeapSize: utils.ValueOrDefault(cfg.Spec.Cassandra.HeapSize, "512M"),
Labels: cfg.Spec.Cassandra.Labels,
Annotations: cfg.Spec.Cassandra.Annotations,
Env: cfg.Spec.Cassandra.Env,
CpuRequest: utils.ValueOrDefault(cfg.Spec.Cassandra.Resources.Requests.Cpu().String(), "500m"),
MemoryRequest: utils.ValueOrDefault(cfg.Spec.Cassandra.Resources.Requests.Memory().String(), "1Gi"),
CpuLimit: utils.ValueOrDefault(cfg.Spec.Cassandra.Resources.Limits.Cpu().String(), "1000m"),
MemoryLimit: utils.ValueOrDefault(cfg.Spec.Cassandra.Resources.Limits.Memory().String(), "2Gi"),
PullPolicy: utils.ValueOrDefault(cfg.Spec.Cassandra.PullPolicy, "IfNotPresent"),
ClusterName: utils.ValueOrDefault(cfg.ClusterName, name),
DC: utils.ValueOrDefault(cfg.DC, "dc1"),
JavaOpts: utils.ValueOrDefault(cfg.JavaOpts, "-Xms512m -Xmx512m"),
StorageSize: utils.ValueOrDefault(storageSize, ""),
StorageClass: utils.ValueOrDefault(storageClass, ""),
HeapSize: utils.ValueOrDefault(cfg.HeapSize, "512M"),
Labels: cfg.Labels,
Annotations: cfg.Annotations,
Env: cfg.Env,
CpuRequest: utils.ValueOrDefault(cfg.Resources.Requests.Cpu().String(), "500m"),
MemoryRequest: utils.ValueOrDefault(cfg.Resources.Requests.Memory().String(), "1Gi"),
CpuLimit: utils.ValueOrDefault(cfg.Resources.Limits.Cpu().String(), "1000m"),
MemoryLimit: utils.ValueOrDefault(cfg.Resources.Limits.Memory().String(), "2Gi"),
PullPolicy: utils.ValueOrDefault(cfg.PullPolicy, "IfNotPresent"),
}

statefulSet := &appsv1.StatefulSet{}
Expand Down Expand Up @@ -342,12 +344,12 @@ func GenerateCassandraConfig(cfg cassandraaxonopscomv1beta1.AxonOpsCassandra) (*
return statefulSet, nil
}

func GenerateCassandraServiceConfig(cfg cassandraaxonopscomv1beta1.AxonOpsCassandra) (*corev1.Service, error) {
func GenerateCassandraServiceConfig(name string, namespace string, labels map[string]string, annonations map[string]string) (*corev1.Service, error) {
config := CassandraServiceConfig{
Name: cfg.GetName(),
Namespace: cfg.GetNamespace(),
Labels: cfg.Spec.Cassandra.Labels,
Annotations: cfg.Spec.Cassandra.Annotations,
Name: name,
Namespace: namespace,
Labels: labels,
Annotations: annonations,
}

svc := &corev1.Service{}
Expand Down Expand Up @@ -380,8 +382,8 @@ func GenerateCassandraHeadlessServiceConfig(cfg cassandraaxonopscomv1beta1.AxonO
config := CassandraServiceConfig{
Name: cfg.GetName(),
Namespace: cfg.GetNamespace(),
Labels: cfg.Spec.Cassandra.Labels,
Annotations: cfg.Spec.Cassandra.Annotations,
Labels: cfg.Labels,
Annotations: cfg.Annotations,
}

svc := &corev1.Service{}
Expand Down
117 changes: 117 additions & 0 deletions config/crd/bases/axonops.com_axonopscassandras.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,121 @@ spec:
additionalProperties:
type: string
type: object
cassandraMetricsCluster:
description: AxonOpsCassandraCluster defines the Apache Cassandra
cluster to install
properties:
annotations:
additionalProperties:
type: string
type: object
clusterName:
type: string
dc:
type: string
env:
items:
description: EnvVars lists the environmetn variables
to add to the deployment or statefulset
properties:
name:
description: Environment variable name
type: string
value:
description: Environment variable value
type: string
type: object
type: array
heapSize:
type: string
image:
properties:
repository:
type: string
tag:
type: string
type: object
javaOpts:
type: string
labels:
additionalProperties:
type: string
type: object
persistentVolume:
description: PersistentVolumeSpec defines the persistent
volume specification
properties:
size:
description: Storage size
type: string
storageClass:
description: Optional Storage Class name
type: string
type: object
pullPolicy:
type: string
replicas:
type: integer
resources:
description: ResourceRequirements describes the compute
resource requirements.
properties:
claims:
description: |-
Claims lists the names of resources, defined in spec.resourceClaims,
that are used by this container.


This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate.


This field is immutable. It can only be set for containers.
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
properties:
name:
description: |-
Name must match the name of one entry in pod.spec.resourceClaims of
the Pod where this field is used. It makes that resource available
inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: |-
Limits describes the maximum amount of compute resources allowed.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
type: object
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: |-
Requests describes the minimum amount of compute resources required.
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
otherwise to an implementation-defined value. Requests cannot exceed Limits.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
type: object
type: object
type: object
cassandraMetricsEnabled:
type: boolean
env:
items:
description: EnvVars lists the environmetn variables to
Expand Down Expand Up @@ -399,6 +514,8 @@ spec:
type: object
clusterName:
type: string
dc:
type: string
env:
items:
description: EnvVars lists the environmetn variables to add
Expand Down
25 changes: 25 additions & 0 deletions config/samples/cassandra-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
apiVersion: axonops.com/v1beta1
kind: AxonOpsCassandra
metadata:
labels:
app.kubernetes.io/name: axonops-developer-operator
app.kubernetes.io/managed-by: kustomize
name: axonopscassandra-sample
namespace: axonops-dev
spec:
cassandra:
replicas: 1
clusterName: "my-dev-env"
axonops:
elasticsearch:
persistentVolume:
size: 2Gi
storageClass: local-path
server:
cassandraMetricsEnabled: true
cassandraMetricsCluster:
replicas: 2
dc: axonops2
persistentVolume:
size: 2Gi
storageClass: local-path
Loading