diff --git a/components/templates/components/_nav.html b/components/templates/components/_nav.html index da1becc..2330ed7 100644 --- a/components/templates/components/_nav.html +++ b/components/templates/components/_nav.html @@ -156,6 +156,10 @@ +
+ + +
diff --git a/components/templates/components/_sidebar.html b/components/templates/components/_sidebar.html index c921429..e002ad5 100644 --- a/components/templates/components/_sidebar.html +++ b/components/templates/components/_sidebar.html @@ -28,101 +28,13 @@ {% endif %} -
- {% include "components/_sidebar_tm_dashboard.html" %} - +
-
  • - - -
    • + {% include "components/_sidebar_tm_dashboard.html" %}
    -
  • - - -
    • + {% include "components/_sidebar_nhn.html" %} +
    + {% include "components/_sidebar_devtools.html" %}
  • diff --git a/components/templates/components/_sidebar_devtools.html b/components/templates/components/_sidebar_devtools.html new file mode 100644 index 0000000..78dba30 --- /dev/null +++ b/components/templates/components/_sidebar_devtools.html @@ -0,0 +1,40 @@ +
  • + + +
    • \ No newline at end of file diff --git a/components/templates/components/_sidebar_nhn.html b/components/templates/components/_sidebar_nhn.html new file mode 100644 index 0000000..1bc8e0c --- /dev/null +++ b/components/templates/components/_sidebar_nhn.html @@ -0,0 +1,48 @@ +
  • + + +
    • \ No newline at end of file diff --git a/components/templates/components/_sidebar_tm_dashboard.html b/components/templates/components/_sidebar_tm_dashboard.html index bfaf3a5..9ac6575 100644 --- a/components/templates/components/_sidebar_tm_dashboard.html +++ b/components/templates/components/_sidebar_tm_dashboard.html @@ -1,8 +1,8 @@
  • - - -
    • \ No newline at end of file + + + \ No newline at end of file diff --git a/custom_auth/forms.py b/custom_auth/forms.py index 4cd8da4..1461965 100644 --- a/custom_auth/forms.py +++ b/custom_auth/forms.py @@ -33,6 +33,7 @@ class CustomUserChangeForm(UserChangeForm): 'url_web_ide', 'url_rancher', 'url_grafana', + 'url_grafana_dashboard_01', 'url_prometheus', 'url_opensearch', 'url_kiali', diff --git a/custom_auth/migrations/0008_customuser_url_grafana_dashboard_01.py b/custom_auth/migrations/0008_customuser_url_grafana_dashboard_01.py new file mode 100644 index 0000000..16456ed --- /dev/null +++ b/custom_auth/migrations/0008_customuser_url_grafana_dashboard_01.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.14 on 2025-04-11 11:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('custom_auth', '0007_customuser_url_mattermost_customuser_url_nexus'), + ] + + operations = [ + migrations.AddField( + model_name='customuser', + name='url_grafana_dashboard_01', + field=models.URLField(blank=True, null=True), + ), + ] diff --git a/custom_auth/models.py b/custom_auth/models.py index 8c6ceab..5b3f752 100644 --- a/custom_auth/models.py +++ b/custom_auth/models.py @@ -22,12 +22,12 @@ class CustomUser(AbstractUser): url_web_ide = models.URLField(max_length=200, blank=True, null=True) url_rancher = models.URLField(max_length=200, blank=True, null=True) url_grafana = models.URLField(max_length=200, blank=True, null=True) + url_grafana_dashboard_01 = models.URLField(max_length=200, blank=True, null=True) # 2025-04-11 추가 url_prometheus = models.URLField(max_length=200, blank=True, null=True) url_opensearch = models.URLField(max_length=200, blank=True, null=True) url_kiali = models.URLField(max_length=200, blank=True, null=True) url_nexus = models.URLField(max_length=200, blank=True, null=True) url_mattermost = models.URLField(max_length=200, blank=True, null=True) - def encrypt_private_key(self, private_key: str) -> bytes: """SSH Private Key 암호화""" diff --git a/telemetry_dashboard/templates/telemetry_dashboard/grafana.html b/telemetry_dashboard/templates/telemetry_dashboard/grafana.html index de4dafa..81f4549 100644 --- a/telemetry_dashboard/templates/telemetry_dashboard/grafana.html +++ b/telemetry_dashboard/templates/telemetry_dashboard/grafana.html @@ -7,13 +7,11 @@

    Grafana

    - + {% if request.user.url_grafana_dashboard_01 %} + + {% else %} +

    접속 후 Profile에 Dashboard URL을 등록하세요.

    + {% endif %}
    {% endblock %} \ No newline at end of file diff --git a/version b/version index fa31590..44e9c80 100644 --- a/version +++ b/version @@ -1 +1 @@ -dev_0.0.37 \ No newline at end of file +dev_0.0.38 \ No newline at end of file