Skip to content

Commit 8b290e9

Browse files
hcourdenthcourdent
authored
Qualification for plans, clarification roles, billing, feature list (windmill-labs#842)
* Clarification roles, billing, feature list * Qualification for plans
1 parent 7189af3 commit 8b290e9

File tree

6 files changed

+880
-742
lines changed

6 files changed

+880
-742
lines changed

‎docs/advanced/18_instance_settings/index.mdx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can also enable automatic username creation from emails. Usernames will be s
3030

3131
A more common way to add users is to use [SSO/OAuth](#authoauth).
3232

33-
For each user, you can see Email, Auth (manually-set password or Auth methods), Name, Kind ([Developer](../../core_concepts/16_roles_and_permissions/index.mdx#developer) or [Operator](../../core_concepts/16_roles_and_permissions/index.mdx#operator)), and Role (User or [Superadmin](../../core_concepts/16_roles_and_permissions/index.mdx#superadmin)).
33+
For each user, you can see Email, Auth (manually-set password or Auth methods), Name, Kind ([Developer](../../core_concepts/16_roles_and_permissions/index.mdx#developer) or [Operator](../../core_concepts/16_roles_and_permissions/index.mdx#operator) where an operator at the instace level is an operator in all workspaces they are member of), and Role (User or [Superadmin](../../core_concepts/16_roles_and_permissions/index.mdx#superadmin)).
3434

3535
You can also toggle on 'Show active users only' to show only users who have performed at least one action in the last 30 days. Only those users are counted in our [Pricing](/pricing).
3636

@@ -357,7 +357,6 @@ When creating a workspace, you have the option to invite automatically everyone
357357
src="/videos/new_workspace.mp4"
358358
/>
359359

360-
361360
## Open Telemetry & Prometheus
362361

363362
![Open Telemetry & Prometheus](./otel_prometheus.png)
@@ -404,13 +403,16 @@ Anonymous usage data is collected to help improve Windmill. Telemetry data is se
404403
![Telemetry](./telemetry.png "Telemetry")
405404

406405
The following information is collected:
407-
- version of your instance
408-
- number and total duration of jobs
409-
- accounts usage
410-
- login type usage
411-
- workers usage
412-
- vCPUs usage
406+
- version of your instances
407+
- instance base URL
408+
- job usage (language, total duration, count)
409+
- login type usage (login type, count)
410+
- worker usage (worker, worker instance, vCPUs, memory)
411+
- user usage (author count, operator count)
412+
- superadmin email addresses
413+
- vCPU usage
413414
- memory usage
415+
- development instance status
414416

415417
From the instance settings, you can manually send usage or disable telemetry.
416418

‎docs/core_concepts/16_roles_and_permissions/index.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ From the workspace settings, you can configure the operator visibility settings
7777
- [Folders](../8_groups_and_folders/index.mdx#folders)
7878
- [Workers](../9_worker_groups/index.mdx)
7979

80-
Regarding to [Pricing](/pricing), operators are counted as half of a regular seat ([developers](#developer)) as long as they are operators in all workspaces they are member of.
80+
Regarding to [Pricing](/pricing), operators are counted as half of a regular seat ([developers](#developer)) as long as they are operators in all workspaces they are member of. Operators are not set as the instance-level.
8181

8282
### Anonymous app viewers
8383

‎docs/misc/7_plans_details/index.mdx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ If you have any questions, please contact support@windmill.dev
155155

156156
As an [Enterprise](/pricing) user, you will have access to detailed usage information and invoices through the [Windmill Customer Portal](https://portal.windmill.dev/). You can update contact information, billing details and subscription (seats & workers/compute units) from the portal.
157157

158+
From the portal, you can adjust your subscription on your own. If you adjust your subscription during a billing cycle, you will be charged a prorated amount for the additional resources. This means you will only pay for the portion of the year that remains after the adjustment. For example on a yearly subscription, if you make the adjustment 10 months into the year, you would pay for approximately 2/12 of the annual cost for the additional resources.
159+
158160
![Portal](./portal.png 'Portal')
159161

160162
Access to the portal is made through either:
@@ -183,7 +185,17 @@ Usage of your instance is reported on the platform - basic metrics such as Seats
183185

184186
## Usage checks
185187

186-
Windmill employs lightweight [telemetry](/pricing#worker-reporting) to automatically track and report the usage of memory and seats for your subscription. Even on self-hosted plans, telemetry associated to your license key is reported to Windmill.
188+
Windmill employs lightweight telemetry to automatically track and report the usage of memory and seats for your subscription. Even on self-hosted plans, telemetry associated to your license key is reported to Windmill.
189+
190+
The following information is collected:
191+
- version of your instance
192+
- number and total duration of jobs
193+
- accounts usage
194+
- login type usage
195+
- workers usage
196+
- vCPUs usage
197+
- memory usage
198+
- superadmin email addresses
187199

188200
How the data is calculated:
189201
- Seats: number of users (1 developer, or 2 operators) who are active (from logging in to running or deploying a script) on the platform in the last 30 days, according to the [audit logs](../../core_concepts/14_audit_logs/index.mdx). User count is across all instances (dev, prod) but Windmill only counts once the same user.

0 commit comments

Comments
 (0)