Skip to content

Commit f05b025

Browse files
committed
Merge branch 'docs/otel-with-vector' of https://github.com/stackabletech/documentation into docs/otel-with-vector
2 parents 0241521 + c2147df commit f05b025

14 files changed

Lines changed: 28 additions & 34 deletions

antora-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ content:
4848
- release/23.4
4949
- release/23.1
5050
# management tools
51-
- url: https://github.com/stackabletech/stackable-cockpit.git
51+
- url: https://github.com/stackabletech/stackablectl.git
5252
start_path: docs
5353
branches: main
5454
# demos

local-antora-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ content:
3333
- release/23.4
3434
- release/23.1
3535
# management tools
36-
- url: https://github.com/stackabletech/stackable-cockpit.git
36+
- url: https://github.com/stackabletech/stackablectl.git
3737
start_path: docs
3838
branches: main
3939
# demos

modules/ROOT/pages/getting-started.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ metadata:
9797
name: simple-zk
9898
spec:
9999
image:
100-
productVersion: 3.9.4
100+
productVersion: 3.9.5
101101
clusterConfig:
102102
tls:
103103
serverSecretClass: null

modules/ROOT/pages/quickstart.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= Quickstart
2-
:latest-release: https://github.com/stackabletech/stackable-cockpit/releases/tag/stackablectl-1.4.0
2+
:latest-release: https://github.com/stackabletech/stackablectl/releases/tag/stackablectl-1.4.0
33
:description: Quickstart guide for Stackable: Install stackablectl, set up a demo, and connect to services like Superset and Trino with easy commands and links.
44

55
This is the super-short getting started guide that should enable you to get something up and running in less than three
@@ -16,9 +16,9 @@ rename the file to `stackablectl`. You can also use the following command:
1616

1717
[source,console]
1818
----
19-
wget -O stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.4.0/stackablectl-x86_64-unknown-linux-gnu
19+
wget -O stackablectl https://github.com/stackabletech/stackablectl/releases/download/stackablectl-1.4.0/stackablectl-x86_64-unknown-linux-gnu
2020
# or
21-
curl -L -o stackablectl https://github.com/stackabletech/stackable-cockpit/releases/download/stackablectl-1.4.0/stackablectl-x86_64-unknown-linux-gnu
21+
curl -L -o stackablectl https://github.com/stackabletech/stackablectl/releases/download/stackablectl-1.4.0/stackablectl-x86_64-unknown-linux-gnu
2222
----
2323

2424
Mark the binary as executable:

modules/ROOT/partials/release-notes/release-23.11.adoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ Airflow clusters can now be configured to use Kubernetes executors, whereby pods
3535
For JVM-based products (i.e. Druid, HBase, HDFS, Hive, Kafka, NiFi, Spark, Trino and ZooKeeper) it is now possible to provide custom security settings that override the default values.
3636
This allows the user to control things such as DNS lookup caches.
3737

38-
===== Stackable Cockpit
39-
This release includes a very early preview version of Stackable Cockpit, a browser-based management tool which interacts with the Stackable data platform to display e.g. deployed stacklets and their status.
40-
41-
===== stackablectl
42-
Our command line tool has been re-worked to use the same backbone as Stackable Cockpit: you can find out about the recent enhancements by visiting the online xref:management:stackablectl:index.adoc[documentation].
43-
4438
===== Listener operator
4539
The listener-operator was introduced in release 23.1 and the associated ServiceType field in 23.4.
4640
In this release we introduce configurable ListenerClass _presets_ that map to the service types appropriate for different environments.

modules/ROOT/partials/release-notes/release-24.11.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ The following product versions are no longer supported (although images for rele
310310

311311
==== stackablectl
312312

313-
* Bump Rust dependencies to fix critical vulnerability in quinn-proto, see https://github.com/advisories/GHSA-vr26-jcq5-fjj8[CVE-2024-45311] (https://github.com/stackabletech/stackable-cockpit/pull/318).
313+
* Bump Rust dependencies to fix critical vulnerability in quinn-proto, see https://github.com/advisories/GHSA-vr26-jcq5-fjj8[CVE-2024-45311] (https://github.com/stackabletech/stackablectl/pull/318).
314314
* We now provide additional completions for Nushell and Elvish, support using SOCK5 and HTTP proxies, and have improved the sorting of release versions.
315315

316316
==== Supported Kubernetes versions

modules/ROOT/partials/release-notes/release-24.3.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ The following product versions are no longer supported (although images for rele
164164
* Apache Superset: 2.1.0
165165
* Apache ZooKeeper: 3.8.1
166166

167-
==== Cockpit and stackablectl
167+
==== stackablectl
168168

169-
A new https://github.com/stackabletech/stackable-cockpit[project] called Stackable Cockpit has been started.
169+
A project called https://github.com/stackabletech/stackablectl[stackablectl] has been started.
170170
It is a web-based management tool that allows users to interact with the Stackable data platform.
171171
The repository also contains the `stackablectl` command line tool, which has been refactored for performance and stability.
172172

modules/ROOT/partials/release-notes/release-25.3.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ The following product versions are no longer supported (although images for rele
183183
* Demos and stacks are now versioned and the main branch is considered unstable.
184184
`stackablectl` by default installs the latest stable demo and/or stack.
185185
A specific release can be targeted by providing the `--release` argument.
186-
See https://github.com/stackabletech/stackable-cockpit/pull/340[stackable-cockpit#340].
186+
See https://github.com/stackabletech/stackablectl/pull/340[stackablectl#340].
187187
* Add new argument --chart-source so that operator charts can be pulled either from an OCI registry (the default) or from a index.yaml-based repository.
188-
See https://github.com/stackabletech/stackable-cockpit/pull/344[stackable-cockpit#344].
188+
See https://github.com/stackabletech/stackablectl/pull/344[stackablectl#344].
189189
* Use `rustls-native-certs` so that `stackablectl` can be used in environments with internal PKI.
190-
See https://github.com/stackabletech/stackable-cockpit/pull/351[stackable-cockpit#351].
190+
See https://github.com/stackabletech/stackablectl/pull/351[stackablectl#351].
191191
* Use `heritage` label when looking up the `minio-console` stacklet.
192-
See https://github.com/stackabletech/stackable-cockpit/pull/364[stackable-cockpit#364].
192+
See https://github.com/stackabletech/stackablectl/pull/364[stackablectl#364].
193193
* Improve tracing and log output.
194-
See https://github.com/stackabletech/stackable-cockpit/pull/365[stackable-cockpit#365].
194+
See https://github.com/stackabletech/stackablectl/pull/365[stackablectl#365].
195195

196196
==== Supported Kubernetes versions
197197

modules/compliance/pages/licenses.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Additional Stackable Operators
2828

2929
== stackablectl
3030

31-
https://github.com/stackabletech/stackable-cockpit/blob/main/LICENSE[License{external-link-icon}^] for stackablectl.
31+
https://github.com/stackabletech/stackablectl/blob/main/LICENSE[License{external-link-icon}^] for stackablectl.
3232

3333
== Product images
3434

modules/contributor/pages/adr/ADR031-resource-labels.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ v0.1, 2023-08-25
1313
1414
== Context and Problem Statement
1515

16-
This ADR tries to solve a common issue within the SDP. When `stackablectl` (and in the future our Cockpit) deploys
16+
This ADR tries to solve a common issue within the SDP. When `stackablectl` deploys
1717
resources into a Kubernetes cluster, we are currently unable to properly identify them afterwards. Adding a common set
1818
of labels to the resources we deploy will solve this issue. Additionally we will use namespaces to track resources
1919
deployed together. The following use-cases are then possible:
@@ -133,17 +133,17 @@ The maximum length for both cases is 63 characters.
133133

134134
The following options are available:
135135

136-
* `app.kubernetes.io/managed-by=stackablectl|stackable-cockpit`: Well-known label, however not recommended because Helm
136+
* `app.kubernetes.io/managed-by=stackablectl|stackablectl`: Well-known label, however not recommended because Helm
137137
already uses this label to track which resources are managed by Helm. As we use Helm in the background to install some
138138
of our manifests, we would potentially break Helms (uninstall) behavior.
139-
* `stackable.tech/managed-by=stackablectl|stackable-cockpit`: Doesn't collide with Helm
140-
* `stackable.tech/deployed-by=stackablectl|stackable-cockpit`: Alternative to above
139+
* `stackable.tech/managed-by=stackablectl|stackablectl`: Doesn't collide with Helm
140+
* `stackable.tech/deployed-by=stackablectl|stackablectl`: Alternative to above
141141

142142
Alternatives are:
143143

144-
* `management.stackable.tech/managed-by=stackablectl|stackable-cockpit`
145-
* `tools.stackable.tech/managed-by=stackablectl|stackable-cockpit`
146-
* `mgmt.stackable.tech/managed-by=stackablectl|stackable-cockpit`
144+
* `management.stackable.tech/managed-by=stackablectl|stackablectl`
145+
* `tools.stackable.tech/managed-by=stackablectl|stackablectl`
146+
* `mgmt.stackable.tech/managed-by=stackablectl|stackablectl`
147147

148148
'''
149149

@@ -290,5 +290,5 @@ for demo in demos_with_label("demo-*") {
290290
with `suffix` being optional and the implementation not yet decided on.
291291
* **Namespacing Stacks and Demos:** Yes, use `stackable-<demo|stack>-<demo-name|stack-name>(-suffix)`
292292
* **Adding Label to indicate which Management Tool was used:** Yes, use
293-
`stackable.tech/managed-by=stackablectl|stackable-cockpit`
293+
`stackable.tech/managed-by=stackablectl|stackablectl`
294294
* **Enabling Custom Labels provided by Users:** No support for now. Add it in the future if this feature is requested.

0 commit comments

Comments
 (0)