fix redis

Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker/dockerfile:1
-FROM python:3 as base
+FROM python:3.11 as base
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 RUN apt-get update && apt-get install apt-transport-https
 RUN apt-get install -y libjpeg62 libjpeg62-turbo-dev  zlib1g-dev gettext entr poppler-utils gettext xfonts-thai vim
 
-RUN wget ftp://ftp.psu.ac.th/pub/thaifonts/sipa-fonts/*ttf -P /usr/share/fonts/truetype/thai
-COPY fonts/*ttf  /usr/share/fonts/truetype/thai/
+#RUN wget ftp://ftp.psu.ac.th/pub/thaifonts/sipa-fonts/*ttf -P /usr/share/fonts/truetype/thai
+#COPY fonts/*ttf  /usr/share/fonts/truetype/thai/
 
 RUN \
         echo "Installing Node and Yarn" && \
@@ -22,6 +22,7 @@ RUN \
 FROM base as install_package
 WORKDIR /code
 COPY requirements.txt /code/
+RUN  python -m pip install --upgrade pip
 RUN  pip install -r requirements.txt
 COPY app /code/
 #RUN chmod a+x server-entrypoint.sh

app/backend/views.py

@@ -23,7 +23,7 @@ def index(request):
 
     rapi = exfo.list_api()
     sla = exfo.call_api("sla")
-   
+
     data_to_parse = """
     interface Loopback0
      description Router-id-loopback
@@ -105,8 +105,8 @@ interface {{ interface | contains("Vlan") }}
     # results = parser.result(format='xlsx')[0]
     # pprint(results)
     try:
-        mk_ips = mkt.call_remote("ip/route") 
-        mk_address = mkt.call_remote("ip/address") 
+        mk_ips = mkt.call_remote("ip/route")
+        mk_address = mkt.call_remote("ip/address")
     except:
         mk_ips = []
         mk_address = []
@@ -252,7 +252,7 @@ def print_table(request):
     return render(request, 'backend/print_table.html')
 
 
-    
+
 def dump_fixed_results(request):
     from bson.json_util import dumps
     from bson.json_util import loads
@@ -312,7 +312,7 @@ def gen_report_notebook():
 
     from_zone = tz.gettz('UTC')
     to_zone = tz.gettz('Asia/Bangkok')
-    
+
     c = db['fixed_results'].find()
     c2  = db['ip_address']
 
@@ -325,14 +325,14 @@ def gen_report_notebook():
         yest = utc - timedelta(minutes=4)
         dt = utc.astimezone(to_zone)
 
-        d = {'header': i['header'], 'results': i['results'], 'output': res, 'params': i['parameters'], 'ts': i['ids']['time_stamp'], 
+        d = {'header': i['header'], 'results': i['results'], 'output': res, 'params': i['parameters'], 'ts': i['ids']['time_stamp'],
              'dt': str(dt), 'test_type_name': i['ids']['fixed_results_url']}
 
-                
+
 
         d.update(i['names'])
         if not d['sla_name']:
-            continue 
+            continue
 
         sla_splt = d['sla_name'].split('-')
         if len(sla_splt) > 1:
@@ -351,7 +351,7 @@ def gen_report_notebook():
                 pprint("Found Target")
                 pprint(target_address)
                 d.update(target_address)
- 
+
         #res.update(i['ids'])
         #res.update(i[])
         #pprint(d)
@@ -366,11 +366,11 @@ def gen_report_notebook():
 
     df1 = df1.query('sla_name == sla_name')
     #pprint(df1['sla_name'].unique())
-    
+
     #df1['results_text'] = df1['results'].apply(con_human)
     df1['results_text'] = df1.apply(con_human, axis=1)
     try:
-        df1['network_str'] = df1['network'] + " / " + df1['interface'] 
+        df1['network_str'] = df1['network'] + " / " + df1['interface']
     except:
         df1['network_str'] = "N/A"
 
@@ -382,33 +382,33 @@ def gen_report(request):
     pprint("report notebook ...")
     if request.GET.get('clear', None):
         return redirect("/backend/dump_fixed_results/?redir=/backend/gen_report/")
-   
+
     try:
         table,df = gen_report_notebook()
     except Exception as e:
         messages.error(request, str(e))
         return render(request, 'backend/gen_report.html', {'dump_again': True})
-    
+
     slas = list(df['sla_name'].unique())
     vrs = list(df['verifier_name'].unique())
     sla_name = request.GET.getlist('sla_name')
     vr_name = request.GET.getlist('vr_name')
-    
+
     pprint("--- sla_name ---")
     pprint(sla_name)
     if len(sla_name) > 0:
         sla_filter = ", ".join(f"'{w}'" for w in sla_name)
         table = table.query(f"sla_name in ({sla_filter})")
-    
+
     if len(vr_name) > 0:
         vr_filter = ", ".join(f"'{w}'" for w in vr_name)
         table = table.query(f"verifier_name in ({vr_filter})")
-    
+
     table = table.dropna(how='all', axis=0)
     table = table.dropna(how='all', axis=1)
 
     gen_report = request.GET.get('genReport', None)
-    
+
     report_link = None
     if gen_report:
         import time
@@ -422,8 +422,8 @@ def gen_report(request):
         report_link = f'/media/{fn}'
 
     try:
-        mk_ips = mkt.call_remote("ip/route") 
-        mk_address = mkt.call_remote("ip/address") 
+        mk_ips = mkt.call_remote("ip/route")
+        mk_address = mkt.call_remote("ip/address")
     except:
         mk_ips = []
         mk_address = []
@@ -436,12 +436,15 @@ def gen_report(request):
 def mikro_dump_task():
     #look at only pppoe only ( excloude pppoe5 )
     col  = db['ip_address']
-    mk_address = mkt.call_remote("ip/address") 
-    for i in mk_address:
-        temp = {'ts': datetime.utcnow()}
-        temp = temp | i
-        col.insert_one(temp)
-    pprint("dump ip complete")
+    try:
+        mk_address = mkt.call_remote("ip/address")
+        for i in mk_address:
+            temp = {'ts': datetime.utcnow()}
+            temp = temp | i
+            col.insert_one(temp)
+        pprint("dump ip complete")
+    except Exception as e:
+        pprint(f"error = {e}")
 
 @shared_task
 def gen_report_task():
@@ -464,9 +467,9 @@ def gen_report_task():
 def list_reports(request):
     import os
     from django.conf import settings
-    
+
     mr = settings.MEDIA_ROOT
-    file_list =os.listdir(mr)  
+    file_list =os.listdir(mr)
 
     def get_creation_time(item):
         item_path = os.path.join(mr, item)

docker-compose.prod.yml

@@ -2,8 +2,6 @@ services:
   redis:
     restart: unless-stopped
     image: redis:7.0.5-alpine
-    expose:
-      - 6379
     ports:
       - "127.0.0.1:6379:6379"
   db:
@@ -21,7 +19,7 @@ services:
     image: tum/network-report-image
     #command: python -X dev manage.py  runserver 0.0.0.0:8000
     #command: python manage.py  runserver 0.0.0.0:8000
-    command: gunicorn kacee.wsgi:application --bind 0.0.0.0:8000 --workers=4 --timeout 1000
+    command: gunicorn network_report.wsgi:application --bind 0.0.0.0:8000 --workers=4 --timeout 1000
     #entrypoint: ./server-entrypoint.sh
     volumes:
       - ./app:/code
@@ -33,7 +31,7 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
       - PYTHONMALLOC=debug
-      - DJANGO_SETTINGS_MODULE=kacee.settings
+      - DJANGO_SETTINGS_MODULE=network_report.settings
       - MODE=${MODE}
     depends_on:
       - db
@@ -79,8 +77,8 @@ services:
     image: rabbitmq:3-management-alpine
     container_name: 'rabbitmq3'
     ports:
-      - "5672:5672"
-      - "15672:15672"
+      - "127.0.0.1:5672:5672"
+      - "127.0.0.1:15672:15672"
     volumes:
         - ./rabbitmq/data/:/var/lib/rabbitmq/
         - ./rabbitmq/log/:/var/log/rabbitmq

docker-compose.yml

@@ -3,13 +3,13 @@ services:
     restart: unless-stopped
     image: redis:7.0.5-alpine
     ports:
-      - "6379"
+      - "127.0.0.1:6379:6379"
   db:
     image: postgres:15.5-alpine3.19
     volumes:
       - ./data/db:/var/lib/postgresql/data
     ports:
-      - "5432"
+      - "127.0.0.1:5432:5432"
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=postgres

requirements.txt

@@ -72,7 +72,7 @@ sorl-thumbnail-serializer-field
 django-debug-permissions
 pdf2image
 django-resized
-django-allauth
+django-allauth==0.54
 django-mjml
 django-fullurl
 xhtml2pdf
@@ -86,7 +86,7 @@ django-pandas
 django-markdownx
 django-qr-code
 python-barcode
-gunicorn==21.2.0
+gunicorn
 django-autotranslate
 pymongo
 dnspython