centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add region_slug column to organization

Browse source
This commit is contained in:
Michael Derynck 2022-10-11 12:04:33 -06:00
parent de3f45929b
commit fa5d4f2674
7 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/apps/api/serializers/organization.py
View file

@ -170,4 +170,14 @@ class PluginOrganizationSerializer(serializers.ModelSerializer):
class Meta:
model = Organization
fields = ["pk", "stack_id", "stack_slug", "grafana_url", "org_id", "org_slug", "org_title", "grafana_token"]
fields = [
"pk",
"stack_id",
"stack_slug",
"grafana_url",
"org_id",
"org_slug",
"org_title",
"region_slug",
"grafana_token",
]

3
engine/apps/grafana_plugin/helpers/gcom.py
View file

@ -57,6 +57,7 @@ def check_gcom_permission(token_string: str, context) -> Optional["GcomToken"]:
org_id=str(instance_info["orgId"]),
org_slug=instance_info["orgSlug"],
org_title=instance_info["orgName"],
region_slug=instance_info["regionSlug"],
gcom_token=token_string,
gcom_token_org_last_time_synced=timezone.now(),
)
@ -64,6 +65,7 @@ def check_gcom_permission(token_string: str, context) -> Optional["GcomToken"]:
organization.stack_slug = instance_info["slug"]
organization.org_slug = instance_info["orgSlug"]
organization.org_title = instance_info["orgName"]
organization.region_slug = instance_info["regionSlug"]
organization.grafana_url = instance_info["url"]
organization.gcom_token = token_string
organization.gcom_token_org_last_time_synced = timezone.now()
@ -72,6 +74,7 @@ def check_gcom_permission(token_string: str, context) -> Optional["GcomToken"]:
"stack_slug",
"org_slug",
"org_title",
"region_slug",
"grafana_url",
"gcom_token",
"gcom_token_org_last_time_synced",

1
engine/apps/grafana_plugin/views/self_hosted_install.py
View file

@ -46,6 +46,7 @@ class SelfHostedInstallView(GrafanaHeadersMixin, APIView):
org_id=org_id,
org_slug=settings.SELF_HOSTED_SETTINGS["ORG_SLUG"],
org_title=settings.SELF_HOSTED_SETTINGS["ORG_TITLE"],
region_slug=settings.SELF_HOSTED_SETTINGS["REGION_SLUG"],
grafana_url=self.instance_context["grafana_url"],
api_token=self.instance_context["grafana_token"],
)

18
engine/apps/user_management/migrations/0004_organization_region_slug.py Normal file
View file

@ -0,0 +1,18 @@
# Generated by Django 3.2.15 on 2022-10-11 17:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('user_management', '0003_user_hide_phone_number'),
]
operations = [
migrations.AddField(
model_name='organization',
name='region_slug',
field=models.CharField(default=None, max_length=300, null=True),
),
]

1
engine/apps/user_management/models/organization.py
View file

@ -53,6 +53,7 @@ class Organization(MaintainableObject):
stack_slug = models.CharField(max_length=300)
org_slug = models.CharField(max_length=300)
org_title = models.CharField(max_length=300)
region_slug = models.CharField(max_length=300, null=True, default=None)
grafana_url = models.URLField()

2
engine/apps/user_management/sync.py
View file

@ -29,6 +29,7 @@ def sync_organization(organization):
"stack_slug",
"org_slug",
"org_title",
"region_slug",
"grafana_url",
"last_time_synced",
"api_token_status",
@ -47,6 +48,7 @@ def sync_instance_info(organization):
organization.stack_slug = instance_info["slug"]
organization.org_slug = instance_info["orgSlug"]
organization.org_title = instance_info["orgName"]
organization.region_slug = instance_info["regionSlug"]
organization.grafana_url = instance_info["url"]
organization.gcom_token_org_last_time_synced = timezone.now()

1
engine/settings/base.py
View file

@ -558,6 +558,7 @@ SELF_HOSTED_SETTINGS = {
"ORG_ID": 100,
"ORG_SLUG": "self_hosted_org",
"ORG_TITLE": "Self-Hosted Organization",
"REGION_SLUG": "self_hosted_region",
}
GRAFANA_INCIDENT_STATIC_API_KEY = os.environ.get("GRAFANA_INCIDENT_STATIC_API_KEY", None)