From c0762f38dad804243b46a6060dd6fd79d1bf5003 Mon Sep 17 00:00:00 2001 From: Alex Nork <48630278+alex-nork@users.noreply.github.com> Date: Mon, 10 Jul 2023 17:17:38 +0000 Subject: [PATCH 01/16] add redis ping --- chirps/target/providers/redis.py | 11 +- chirps/target/templates/target/dashboard.html | 119 +++++++++++------- chirps/target/urls.py | 1 + chirps/target/views.py | 17 +++ 4 files changed, 98 insertions(+), 50 deletions(-) diff --git a/chirps/target/providers/redis.py b/chirps/target/providers/redis.py index 9a1f7a47..5f8c9229 100644 --- a/chirps/target/providers/redis.py +++ b/chirps/target/providers/redis.py @@ -2,6 +2,7 @@ from logging import getLogger from django.db import models +from redis import Redis from target.models import BaseTarget logger = getLogger(__name__) @@ -28,5 +29,11 @@ def search(self, query: str, max_results: int) -> str: def test_connection(self) -> bool: """Ensure that the Redis target can be connected to.""" - logger.error('RedisTarget search not implemented') - raise NotImplementedError + client = Redis( + host=self.host, + port=self.port, + db=self.database_name, + password=self.password, + username=self.username, + ) + return client.ping() diff --git a/chirps/target/templates/target/dashboard.html b/chirps/target/templates/target/dashboard.html index 4f7425de..d0e55323 100644 --- a/chirps/target/templates/target/dashboard.html +++ b/chirps/target/templates/target/dashboard.html @@ -1,7 +1,7 @@ -{% extends 'base.html' %} -{% block title %}Targets{% endblock %} - -{% block content %} +{% extends 'base.html' %} +{% block title %}Targets{% endblock %} + +{% block content %}
-
- {% if target.html_name == 'Mantium' %}
- Application ID: {{ target.app_id }}
- {% elif target.html_name == 'Redis' %}
- Host: {{ target.host }}
- Port: {{ target.port }}
- Database Name: {{ target.database_name }}
- Username: {{ target.username }}
- {% endif %}
- {% if target.html_name == 'Pinecone' %}
- API Key: {{ target.decrypted_api_key }}
- Environment: {{ target.environment }}
- Index Name: {{ target.index_name }}
- Project Name: {{ target.project_name }}
- {% endif %}
-
+
+ {% if target.html_name == 'Mantium' %}
+ Application ID: {{ target.app_id }}
+ {% elif target.html_name == 'Redis' %}
+ Host: {{ target.host }}
+ Port: {{ target.port }}
+ Database Name: {{ target.database_name }}
+ Username: {{ target.username }}
+ {% endif %}
+ {% if target.html_name == 'Pinecone' %}
+ API Key: {{ target.decrypted_api_key }}
+ Environment: {{ target.environment }}
+ Index Name: {{ target.index_name }}
+ Project Name: {{ target.project_name }}
+ {% endif %}
+
-
- {% if target.html_name == 'Mantium' %}
- Application ID: {{ target.app_id }}
- {% elif target.html_name == 'Redis' %}
- Host: {{ target.host }}
- Port: {{ target.port }}
- Database Name: {{ target.database_name }}
- Username: {{ target.username }}
- {% endif %}
- {% if target.html_name == 'Pinecone' %}
- API Key: {{ target.decrypted_api_key }}
- Environment: {{ target.environment }}
- Index Name: {{ target.index_name }}
- Project Name: {{ target.project_name }}
- {% endif %}
-
+ {% if target.html_name == 'Mantium' %}
+ Application ID: {{ target.app_id }}
+ {% elif target.html_name == 'Redis' %}
+ Host: {{ target.host }}
+ Port: {{ target.port }}
+ Database Name: {{ target.database_name }}
+ Username: {{ target.username }}
+ {% endif %}
+ {% if target.html_name == 'Pinecone' %}
+ API Key: {{ target.decrypted_api_key }}
+ Environment: {{ target.environment }}
+ Index Name: {{ target.index_name }}
+ Project Name: {{ target.project_name }}
+ {% endif %}
+