Skip to content

Commit 9b42da8

Browse files
committed
feat(workflow): use timescaledb replace influxdb
1 parent ed0dea7 commit 9b42da8

11 files changed

Lines changed: 16 additions & 76 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Please see below for links and descriptions of each component:
2020
- [registry](https://github.com/drycc/registry) - The Docker registry
2121
- [logger](https://github.com/drycc/logger) - The (in-memory) log buffer for `drycc logs`
2222
- [monitor](https://github.com/drycc/monitor) - The platform monitoring components
23-
- [influxdb](https://github.com/drycc/influxdb) - The controller app metrics database
2423
- [prometheus](https://github.com/drycc/prometheus) - The monitor database
2524
- [rabbitmq](https://github.com/drycc/rabbitmq) - RabbitMQ is a message broker used with controller celery
2625
- [storage](https://github.com/drycc/storage) - The in-cluster, kubernetes storage, s3 api compatible, hybrid storage system.

_scripts/install.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,6 @@ function install_drycc {
374374
echo -e "\\033[32m---> Start installing workflow...\\033[0m"
375375
RABBITMQ_USERNAME=$(cat /proc/sys/kernel/random/uuid)
376376
RABBITMQ_PASSWORD=$(cat /proc/sys/kernel/random/uuid)
377-
INFLUXDB_USERNAME=$(cat /proc/sys/kernel/random/uuid)
378-
INFLUXDB_PASSWORD=$(cat /proc/sys/kernel/random/uuid)
379-
380377

381378
cat << EOF > "/tmp/drycc-values.yaml"
382379
global:
@@ -457,16 +454,6 @@ rabbitmq:
457454
imagebuilder:
458455
imageRegistry: ${DRYCC_REGISTRY}
459456
460-
influxdb:
461-
replicas: ${INFLUXDB_REPLICAS}
462-
imageRegistry: ${DRYCC_REGISTRY}
463-
user: "${INFLUXDB_USERNAME}"
464-
password: "${INFLUXDB_PASSWORD}"
465-
persistence:
466-
enabled: true
467-
size: ${INFLUXDB_PERSISTENCE_SIZE:-5Gi}
468-
storageClass: ${INFLUXDB_PERSISTENCE_STORAGE_CLASS:-""}
469-
470457
logger:
471458
replicas: ${LOGGER_REPLICAS}
472459
imageRegistry: ${DRYCC_REGISTRY}
@@ -539,8 +526,6 @@ EOF
539526
--create-namespace --wait --timeout 30m0s
540527
echo -e "\\033[32m---> Rabbitmq username: $RABBITMQ_USERNAME\\033[0m"
541528
echo -e "\\033[32m---> Rabbitmq password: $RABBITMQ_PASSWORD\\033[0m"
542-
echo -e "\\033[32m---> Influxdb username: $INFLUXDB_USERNAME\\033[0m"
543-
echo -e "\\033[32m---> Influxdb password: $INFLUXDB_PASSWORD\\033[0m"
544529
}
545530

546531
function install_helmbroker {

charts/workflow/Chart.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ dependencies:
3737
- name: registry-proxy
3838
repository: oci://registry.drycc.cc/charts-testing
3939
version: x.x.x
40-
- name: influxdb
41-
repository: oci://registry.drycc.cc/charts-testing
42-
version: x.x.x
4340
- name: rabbitmq
4441
repository: oci://registry.drycc.cc/charts-testing
4542
version: x.x.x

charts/workflow/values.yaml

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# If the service is used by a component alone, it needs to be configured inside the component.
44
# Refer to rabbitmqUrl and databaseUrl of the controller component.
55
# If the service is dependent on multiple components and there is state synchronization,
6-
# it needs to be configured separately, such as storage and influxdb.
6+
# it needs to be configured separately, such as storage.
77

88
global:
99
# Admin email, used for each component to send email to administrator
@@ -36,13 +36,7 @@ global:
3636
# - on-cluster: Run Rabbitmq within the Kubernetes cluster
3737
# - off-cluster: Run Rabbitmq outside the Kubernetes cluster (configure in controller section)
3838
rabbitmqLocation: "on-cluster"
39-
# Set the location of Workflow's influxdb cluster
40-
#
41-
# Valid values are:
42-
# - on-cluster: Run Influxdb within the Kubernetes cluster
43-
# - off-cluster: Influxdb is running outside of the cluster and credentials and connection information will be provided.
44-
influxdbLocation: "on-cluster"
45-
# Set the location of Workflow's influxdb cluster
39+
# Set the location of Workflow's prometheus cluster
4640
#
4741
# Valid values are:
4842
# - on-cluster: Run prometheus within the Kubernetes cluster
@@ -209,35 +203,6 @@ rabbitmq:
209203
## If the PV uses a different storage class, specify that here.
210204
storageClass: ""
211205

212-
influxdb:
213-
# URL configuration is only available in off-cluster Influx database
214-
url: "http://my.influx.url:8086"
215-
bucket: "kubernetes"
216-
org: "drycc"
217-
# If influxdb is off-cluster, it must be specified
218-
# Otherwise, it is generated randomly, if it is empty
219-
token: ""
220-
# Configure the following is only available in on-cluster Influx database
221-
user: "admin"
222-
password: "admin123"
223-
retention: "30d"
224-
# GCP PDs and EBS volumes are supported only
225-
persistence:
226-
enabled: false # Set to true to enable persistence
227-
accessMode: ReadWriteOnce
228-
size: 5Gi # PVC size
229-
## influxdb data Persistent Volume Storage Class
230-
## If defined, storageClassName: <storageClass>
231-
## If set to "-", storageClassName: "", which disables dynamic provisioning
232-
## If undefined (the default) or set to null, no storageClassName spec is
233-
## set, choosing the default provisioner. (gp2 on AWS, standard on
234-
## GKE, AWS & OpenStack)
235-
##
236-
## Storage class of PV to bind. By default it looks for standard storage class.
237-
## If the PV uses a different storage class, specify that here.
238-
storageClass: ""
239-
volumeName: ""
240-
241206
fluentd:
242207
syslog:
243208
# Configure the following ONLY if using Fluentd to send log messages to both
@@ -255,7 +220,7 @@ monitor:
255220
enabled: false # Set to true to enable persistence
256221
accessMode: ReadWriteOnce
257222
size: 5Gi # PVC size
258-
## influxdb data Persistent Volume Storage Class
223+
## grafana data Persistent Volume Storage Class
259224
## If defined, storageClassName: <storageClass>
260225
## If set to "-", storageClassName: "", which disables dynamic provisioning
261226
## If undefined (the default) or set to null, no storageClassName spec is
@@ -324,7 +289,6 @@ gateway:
324289
- drycc
325290
- drycc-rabbitmq
326291
- drycc-passport
327-
- drycc-influxdb
328292
- drycc-prometheus
329293
- drycc-monitor-grafana
330294
# custom listeners

src/installing-workflow/index.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ More rigorous installations would benefit from using outside sources for the fol
3131
* [Postgres](configuring-postgres.md) - For example AWS RDS.
3232
* [Registry](configuring-registry.md) - This includes [quay.io](https://quay.io), [dockerhub](https://hub.docker.com), [Amazon ECR](https://aws.amazon.com/ecr/), and [Google GCR](https://cloud.google.com/container-registry/).
3333
* [Redis](../managing-workflow/platform-logging.md#configuring-off-cluster-redis) - Such as AWS Elasticache
34-
* [InfluxDB](../managing-workflow/platform-monitoring.md#configuring-off-cluster-influxdb) and [Grafana](../managing-workflow/platform-monitoring.md#off-cluster-grafana)
34+
* [Grafana](../managing-workflow/platform-monitoring.md#off-cluster-grafana)
3535

3636
#### Gateway
3737

@@ -70,7 +70,6 @@ $ helm install drycc oci://registry.drycc.cc/charts/workflow \
7070
--set database.imageRegistry=quay.io \
7171
--set fluentd.imageRegistry=quay.io \
7272
--set redis.imageRegistry=quay.io \
73-
--set influxdb.imageRegistry=quay.io \
7473
--set rabbitmq.imageRegistry=quay.io \
7574
--set logger.imageRegistry=quay.io \
7675
--set storage.imageRegistry=quay.io \
@@ -106,7 +105,6 @@ drycc-builder-574483744-l15zj 1/1 Running 0 4m
106105
drycc-controller-3953262871-pncgq 1/1 Running 2 4m
107106
drycc-controller-celery-cmxxn 3/3 Running 0 4m
108107
drycc-database-83844344-47ld6 1/1 Running 0 4m
109-
drycc-influxdb-2729788615-m9b5n 1/1 Running 0 4m
110108
drycc-logger-176328999-wjckx 1/1 Running 4 4m
111109
drycc-logger-fluentd-zxnqb 1/1 Running 0 4m
112110
drycc-redis-304849759-1f35p 1/1 Running 0 4m

src/managing-workflow/platform-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ We now include a monitoring stack for introspection on a running Kubernetes clus
3030
```
3131

3232
## [Grafana](https://grafana.com/)
33-
Grafana allows users to create custom dashboards that visualize the data captured to the running InfluxDB component. By default Grafana is exposed using a [service annotation](https://github.com/drycc/router#how-it-works) through the router at the following URL: `http://grafana.mydomain.com`. The default login is `admin/admin`. If you are interested in changing these values please see [Tuning Component Settings][].
33+
Grafana allows users to create custom dashboards that visualize the data captured to the running Prometheus component. By default Grafana is exposed using a [service annotation](https://github.com/drycc/router#how-it-works) through the router at the following URL: `http://grafana.mydomain.com`. The default login is `admin/admin`. If you are interested in changing these values please see [Tuning Component Settings][].
3434

3535
Grafana will preload several dashboards to help operators get started with monitoring Kubernetes and Drycc Workflow.
3636
These dashboards are meant as starting points and don't include every item that might be desirable to monitor in a

src/managing-workflow/tuning-component-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ For a list of other options you can set by using environment variables please se
161161
### [Telegraf](https://docs.influxdata.com/telegraf)
162162
For a list of configuration values that can be set by using environment variables please see the following [configuration file](https://github.com/drycc/monitor/blob/main/telegraf/rootfs/config.toml.tpl).
163163

164-
### [InfluxDB](https://docs.influxdata.com/influxdb)
165-
You can find a list of values that can be set using environment variables [here](https://github.com/drycc/influxdb/blob/main/rootfs/home/influxdb/config.toml.tpl).
164+
### [Prometheus](https://prometheus.io)
165+
You can find a list of values that can be set using environment variables [here](https://github.com/drycc/prometheus).
166166

167167
## Customizing the Registry
168168

src/managing-workflow/upgrading-workflow.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ drycc-builder-2448122224-3cibz 1/1 Running 0 5m
4747
drycc-controller-1410285775-ipc34 1/1 Running 3 5m
4848
drycc-controller-celery-694f75749b-cmxxn 3/3 Running 0 5m
4949
drycc-database-e7c5z 1/1 Running 0 5m
50-
drycc-influxdb-ah8io 1/1 Running 0 5m
5150
drycc-logger-cgjup 1/1 Running 3 5m
5251
drycc-logger-fluentd-45h7j 1/1 Running 0 5m
5352
drycc-logger-fluentd-4z7lw 1/1 Running 0 5m

src/quickstart/install-workflow.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,6 @@ STORAGE_META_TIKV_PERSISTENCE_SIZE | The size of the persistence space a
218218
STORAGE_META_TIKV_PERSISTENCE_STORAGE_CLASS| StorangeClass of `storage meta tikv`; default storangeclass is used by default
219219
MONITOR_GRAFANA_PERSISTENCE_SIZE | The size of the persistence space allocated to `monitor.grafana`, which is `5Gi` by default
220220
MONITOR_GRAFANA_PERSISTENCE_STORAGE_CLASS | StorangeClass of `monitor` grafana; default storangeclass is used by default
221-
INFLUXDB_REPLICAS | Number of influxdb replicas to deploy
222-
INFLUXDB_PERSISTENCE_SIZE | The size of the persistence space allocated to `influxdb`, which is `5Gi` by default
223-
INFLUXDB_PERSISTENCE_STORAGE_CLASS | StorangeClass of `influxdb`; default storangeclass is used by default
224221
LOGGER_REPLICAS | Number of logger replicas to deploy
225222
RABBITMQ_REPLICAS | Number of rabbitmq replicas to deploy
226223
RABBITMQ_PERSISTENCE_SIZE | The size of the persistence space allocated to `rabbitmq`, which is `5Gi` by default

src/troubleshooting/kubectl.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ running, run:
1414
drycc-controller-h6lk6 0/1 ContainerCreating 0 4s
1515
drycc-controller-celery-cmxxn 0/3 ContainerCreating 0 4s
1616
drycc-database-56v39 0/1 ContainerCreating 0 4s
17-
drycc-influxdb-f9ftm 0/1 Pending 0 3s
1817
drycc-logger-fluentd-xihr1 0/1 Pending 0 2s
1918
drycc-logger-grupg 0/1 ContainerCreating 0 3s
2019
drycc-storage-c2exb 0/1 Pending 0 3s

0 commit comments

Comments
 (0)