Merge pull request #321 from salopensource/version-4

Version 4

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   test:
     docker:
-      - image: circleci/python:2.7-jessie
+      - image: circleci/python:3.7.1
 
     working_directory: ~/repo
 
@@ -19,7 +19,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
-            virtualenv venv
+            python -m venv venv
             . venv/bin/activate
             pip install -r setup/requirements.txt
             pip install flake8

.dockerignore

@@ -0,0 +1 @@
+*.pyc

.flake8

@@ -1,5 +1,5 @@
 [flake8]
+max-line-length = 120
 ignore = F401,F405,E402,F403,W504,W605
-max-line-length = 100
 max-complexity = 126
 exclude = venv/*,*/migrations/*,wip_plugins/*,datatableview/*, sal/settings.py

.gitignore

@@ -42,6 +42,7 @@ sal/settings.py
 
 sal-small.db
 sal_env/
+plugins.old
 
 # node stuff
 node_modules/

Dockerfile

@@ -1,5 +1,5 @@
 # Sal Dockerfile
-FROM ubuntu:14.04
+FROM python:3.7.1
 
 MAINTAINER Graham Gilbert <[email protected]>
 
@@ -17,18 +17,19 @@ ENV MAINT_FREQUENCY 300
 # ENV DOCKERIZE_VERSION v0.3.0
 
 RUN apt-get update && \
+    mkdir -p /usr/share/man/man1 && \
+    mkdir -p /usr/share/man/man7 && \
     apt-get install -y libc-bin && \
     apt-get install -y software-properties-common && \
     apt-get -y update && \
-    add-apt-repository -y ppa:nginx/stable && \
     apt-get -y install \
     git \
+    gcc \
     nginx \
-    python-setuptools \
     postgresql \
     postgresql-contrib \
     libpq-dev \
-    python-dev \
+    python3-dev \
     curl \
     supervisor \
     libffi-dev && \
@@ -37,10 +38,9 @@ RUN apt-get update && \
     mkdir /tmp/setup
 COPY setup/requirements.txt /tmp/setup/requirements.txt
 COPY requirements.txt /tmp/requirements.txt
-RUN easy_install pip && \
-    pip install -r /tmp/requirements.txt && \
+RUN pip install -r /tmp/requirements.txt && \
     rm /tmp/requirements.txt && \
-    rm -rf /tmp/setup && \
+    # rm -rf /tmp/setup && \
     update-rc.d -f postgresql remove && \
     update-rc.d -f nginx remove && \
     mkdir -p /home/app && \
@@ -67,6 +67,9 @@ RUN chmod 755 /run.sh && \
     touch $APP_DIR/sal.log &&\
     chmod 777 $APP_DIR/sal.log
 
+    #&& \
+    #find . -name $APP_DIR/\*.pyc -delete
+
 WORKDIR $APP_DIR
 EXPOSE 8000
 

README.md

@@ -1,7 +1,7 @@
 # Sal
 [![CircleCI](https://circleci.com/gh/salopensource/sal.svg?style=svg)](https://circleci.com/gh/salopensource/sal)
 
-Sal is a multi-tenanted reporting dashboard for [Munki](https://github.com/munki/munki/) with the ability to display information from [Facter](http://puppetlabs.com/facter). It has a plugin system allowing you to easily build widgets to display your custom information from Facter or Munki's [conditional items](https://github.com/munki/munki/wiki/Conditional-Items) (or both!).
+Sal is a multi-tenanted reporting dashboard for [Munki](https://github.com/munki/munki/) with the ability to display information from [Facter](http://puppetlabs.com/facter). It has a plugin system allowing you to easily build widgets to display your custom information from Facter, Grains, Munki's [conditional items](https://github.com/munki/munki/wiki/Conditional-Items) etc.
 
 With Sal, you are able to allow access to reports on certain sets of machines to certain people - for example, giving a manager access to the reports on the machines in their department.
 

api/fixtures/machine_fixtures.json

@@ -11,8 +11,8 @@
         "memory_kb": 16777216,
         "munki_version": "2.8.1.2845",
         "manifest": "C0DEADBEEF",
-        "hd_space": "476429672",
-        "hd_total": "975912960",
+        "hd_space": 476429672000,
+        "hd_total": 975912960000,
         "hd_percent": "51",
         "console_user": "shcrai",
         "machine_model": "MacBookPro11,5",
@@ -22,14 +22,7 @@
         "os_family": "Darwin",
         "last_checkin": "2016-10-06T19:29:38.376Z",
         "first_checkin": "2016-10-06T15:51:21.145Z",
-        "report": "",
-        "errors": 4,
-        "warnings": 7,
-        "activity": false,
-        "puppet_version": "4.7.0",
         "sal_version": "1.0.6",
-        "last_puppet_run": "2016-10-06T19:06:21Z",
-        "puppet_errors": 0,
         "deployed": true,
         "broken_client": false
     }
@@ -46,8 +39,8 @@
         "memory_kb": 16777216,
         "munki_version": "2.8.2.2855",
         "manifest": "C1DEADBEEF",
-        "hd_space": "536276480",
-        "hd_total": "975831040",
+        "hd_space": 536276480000,
+        "hd_total": 975831040000,
         "hd_percent": "45",
         "console_user": "shcrai",
         "machine_model": "MacBookPro13,3",
@@ -57,14 +50,7 @@
         "os_family": "Darwin",
         "last_checkin": "2017-05-16T19:04:51.336Z",
         "first_checkin": "2017-05-16T19:04:51.728Z",
-        "report": "",
-        "errors": 0,
-        "warnings": 3,
-        "activity": false,
-        "puppet_version": "4.10.1",
         "sal_version": "2.0.3",
-        "last_puppet_run": "2017-05-16T18:54:56Z",
-        "puppet_errors": 0,
         "deployed": true,
         "broken_client": false
     }

api/fixtures/message_fixtures.json

@@ -0,0 +1,12 @@
+[
+    {
+        "model": "server.message",
+        "pk": 1,
+        "fields": {
+            "machine": 1,
+            "text": "Missing plist path or version!",
+            "date": "2019-02-28T21:00:46.441Z",
+            "message_type": "ERRORS"
+        }
+    }
+]