diff --git a/server/extension/sql/200_quotas.sql b/server/extension/sql/200_quotas.sql index 177d8c6..f8fe8cf 100644 --- a/server/extension/sql/200_quotas.sql +++ b/server/extension/sql/200_quotas.sql @@ -64,6 +64,18 @@ RETURNS SETOF cdb_dataservices_server.service_params AS $$ provider = user_routing_config.provider ret += [[service, monthly_quota, used_quota, soft_limit, provider]] + #-- Observatory + service = 'observatory' + plpy.execute("SELECT cdb_dataservices_server._get_obs_config({0}, {1})".format(plpy.quote_nullable(username), plpy.quote_nullable(orgname))) + user_obs_config = GD["user_obs_config_{0}".format(username)] + user_service = UserMetricsService(user_obs_config, redis_conn) + + monthly_quota = user_obs_config.monthly_quota + used_quota = user_service.used_quota(user_routing_config, today) + soft_limit = user_obs_config.soft_limit + provider = user_obs_config.provider + ret += [[service, monthly_quota, used_quota, soft_limit, provider]] + return ret $$ LANGUAGE plpythonu;