Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Report tenants usage info to HM (#69009)

Roman Abdulmanov5d745ce4c853
diff --git a/enterprise/backend/src/metabase_enterprise/internal_stats/core.clj b/enterprise/backend/src/metabase_enterprise/internal_stats/core.clj
index d36ccef06e3..6261c517c7f 100644
--- a/enterprise/backend/src/metabase_enterprise/internal_stats/core.clj
+++ b/enterprise/backend/src/metabase_enterprise/internal_stats/core.clj
@@ -21,4 +21,5 @@
(setting/get-value-of-type :boolean :saml-enabled))))
:enabled-embedding-simple (boolean (and (setting/get-value-of-type :boolean :enable-embedding-simple)
(or (setting/get-value-of-type :boolean :jwt-enabled)
- (setting/get-value-of-type :boolean :saml-enabled))))})
+ (setting/get-value-of-type :boolean :saml-enabled))))
+ :use-tenants (boolean (setting/get-value-of-type :boolean :use-tenants))})
diff --git a/src/metabase/internal_stats/core.clj b/src/metabase/internal_stats/core.clj
index 46a42282d01..9da3f7aae59 100644
--- a/src/metabase/internal_stats/core.clj
+++ b/src/metabase/internal_stats/core.clj
@@ -14,7 +14,9 @@
(p/import-vars
[user-stats
email-domain-count
- external-users-count])
+ external-users-count
+ tenant-users-count
+ tenants-with-active-users-count])
(p/import-vars
[query-execution-stats
diff --git a/src/metabase/internal_stats/users.clj b/src/metabase/internal_stats/users.clj
index 96c62bc6091..bdec21eda9e 100644
--- a/src/metabase/internal_stats/users.clj
+++ b/src/metabase/internal_stats/users.clj
@@ -21,3 +21,20 @@
;; Because we need this count *during* token checks, this uses `t2/table-name` to avoid the `after-select` method on
;; users, which calls an EE method that needs ... a token check :|
(t2/count (t2/table-name :model/User) :is_active true :sso_source "jwt" :type "personal"))
+
+(defn tenant-users-count
+ "Number of active users that belong to a tenant."
+ []
+ ;; Because we need this count *during* token checks, this uses `t2/table-name` to avoid the `after-select` method on
+ ;; users, which calls an EE method that needs ... a token check :|
+ (t2/count (t2/table-name :model/User) :is_active true :tenant_id [:not= nil] :type "personal"))
+
+(defn tenants-with-active-users-count
+ "Number of tenants that have at least one active user."
+ []
+ (:count (t2/query-one {:select [[[:count [:distinct :tenant_id]] :count]]
+ :from [(t2/table-name :model/User)]
+ :where [:and
+ [:= :is_active true]
+ [:= :type [:inline "personal"]]
+ [:not= :tenant_id nil]]})))
diff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.clj
index 1f154d3c999..aeb437c3e02 100644
--- a/src/metabase/premium_features/token_check.clj
+++ b/src/metabase/premium_features/token_check.clj
@@ -103,7 +103,8 @@
{:enabled-embedding-static false
:enabled-embedding-interactive false
:enabled-embedding-sdk false
- :enabled-embedding-simple false})
+ :enabled-embedding-simple false
+ :use-tenants false})
(defn- yesterday []
(-> (t/offset-date-time (t/zone-offset "+00"))
@@ -154,7 +155,9 @@
:embedding-question-count embedding-question-count
:external-users ext-users
:internal-users (- users ext-users)
- :domains (internal-stats/email-domain-count)})]
+ :domains (internal-stats/email-domain-count)
+ :tenant-users (internal-stats/tenant-users-count)
+ :tenants (internal-stats/tenants-with-active-users-count)})]
(log/info "Reporting Metabase stats:" stats)
stats))