Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pyouroboros/ouroboros
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.3.5
Choose a base ref
...
head repository: pyouroboros/ouroboros
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Dec 21, 2018

  1. initial commit (#67)

    circa10a authored Dec 21, 2018
    Copy the full SHA
    987b421 View commit details

Commits on Dec 26, 2018

  1. Enable Timezone Configuration (#69)

    * enable timezone configuration
    
    * Update README.md
    
    * fix changelog
    circa10a authored Dec 26, 2018
    Copy the full SHA
    8fdc8c0 View commit details

Commits on Dec 30, 2018

  1. Webhook notifications (#71)

    * now for tests... ugh. Traci halp
    
    * docs
    
    * fix docs
    
    * docs
    
    * why wasnt this there before
    
    * why wasnt this there before
    
    * fix main unit
    
    * now for tests... ugh. Traci halp
    
    * docs
    
    * fix docs
    
    * docs
    
    * why wasnt this there before
    
    * why wasnt this there before
    
    * fix main unit
    
    * add webhook test
    
    * fix spaces
    
    * clean up readme
    
    * bump version
    circa10a authored Dec 30, 2018
    Copy the full SHA
    dbf803f View commit details
  2. Copy the full SHA
    db75750 View commit details
  3. Pre merge code quality checks (#72)

    * fix files with flake8
    
    * bump version for per merge checks
    circa10a authored Dec 30, 2018
    Copy the full SHA
    5f6357b View commit details

Commits on Jan 8, 2019

  1. Update setup.py

    circa10a authored Jan 8, 2019
    Copy the full SHA
    e56d42b View commit details
  2. Update setup.py

    circa10a authored Jan 8, 2019
    Copy the full SHA
    d2978c6 View commit details
  3. fix install

    circa10a committed Jan 8, 2019
    Copy the full SHA
    862893d View commit details
  4. bump python version

    circa10a committed Jan 8, 2019
    Copy the full SHA
    34acd97 View commit details
  5. test_bump pytest version

    circa10a committed Jan 8, 2019
    Copy the full SHA
    2ccdfbf View commit details
  6. fix typo in setup

    circa10a committed Jan 8, 2019
    Copy the full SHA
    0b38473 View commit details
  7. update changelog

    circa10a committed Jan 8, 2019
    Copy the full SHA
    503c635 View commit details

Commits on Jan 9, 2019

  1. add aarch64 docker image (#77)

    * add aarch64 docker image
    
    * update readme
    
    * update readme
    circa10a authored Jan 9, 2019
    Copy the full SHA
    d69c226 View commit details
  2. fix deploy script

    circa10a authored and circa10a committed Jan 9, 2019
    Copy the full SHA
    02a176c View commit details

Commits on Jan 12, 2019

  1. Refactor (#79)

    * rename and move files around + move imports outside main
    
    * ok. Lots done. going to bed. TODO::logging
    
    * enhance logger
    
    * keep_tag to latest
    
    * unified logger experience
    
    * build data export classes and a manager
    
    * built notification manager
    
    * cleanup
    
    * exit on api error
    
    * add discord flag
    
    * Revert "add discord flag"
    
    This reverts commit e907511
    
    * Revert "exit on api error"
    
    This reverts commit 40dffc0
    
    * Revert "cleanup"
    
    This reverts commit 75e669c
    
    * Revert "built notification manager"
    
    This reverts commit 391004d
    
    * Revert "build data export classes and a manager"
    
    This reverts commit 09e2f46
    
    * Revert "unified logger experience"
    
    This reverts commit 6a3bcea
    
    * Revert "keep_tag to latest"
    
    This reverts commit f3df637
    
    * Revert "enhance logger"
    
    This reverts commit 1cb5fc4
    
    * rebuild
    
    * moved and renamed for allow
    
    * change minimum interval to 30 seconds
    
    * fix title
    
    * move setup script expected location
    
    * group argparse
    
    * loglevel to log_level
    
    * removed regex
    
    * added influx
    
    * fix preconfig and add check in blacklist
    
    * fixed private auth
    
    * fix webhook urls not splitting properly #76
    
    * multi-host support
    
    * fixed entrypoint in dockerfile
    
    * set shebang for pip file
    
    * undo pycharm rename refactor in readme
    
    * cast to lower
    
    * oops. left testing exit
    
    * one more to lower
    
    * fix for local build
    
    * think im close
    
    * E241 + F401
    
    * Fixed datamanager ignore. Was missing in Config.options
    
    * finally fixed blacklistfilter!!!
    
    * set requirements.txt min versions
    
    * fixed pip
    
    * change to always running
    
    * fix counters for working with prometheus too
    
    * made datamanager not instanced per socket
    
    * accounted for multi container image use when cleanup wants to delete
    
    * split counts per socket
    
    * finished split. Might need to look at prometheus
    
    * fixed logger per TK discussion
    
    * fixed prometheus by label
    
    * add ssl option to influxdb
    dirtycajunrice authored and circa10a committed Jan 12, 2019
    Copy the full SHA
    5fec8b5 View commit details
  2. change loglevel to use upper() (#84)

    * change loglevel to use upper()
    
    * uppercase default log level
    circa10a authored Jan 12, 2019
    Copy the full SHA
    55437d7 View commit details
  3. Prometheus bind fix, org rename (#81)

    * remove test deps, fix prometheus all update counter, fix http_server bind port
    
    * missing comma, bind addr and port was being ignored because giant string
    
    * add check for container removal + spacing
    
    * add gauge for all containers to separate for prometheus
    circa10a authored Jan 12, 2019
    Copy the full SHA
    0ae1ada View commit details

Commits on Jan 13, 2019

  1. Removed old test related items, removed the need for duplicate bin sc… (

    #85)
    
    * Removed old test related items, removed the need for duplicate bin scripts
    
    * remove coverage badge
    
    * remove test things from travis
    
    * remove gif, since no longer applicable
    
    * pin versions in requirements.dev, setup.py, add sample ouroboros test command to travis
    circa10a authored Jan 13, 2019
    Copy the full SHA
    2e8cbfd View commit details
  2. changed webhook json to auto-deciding + fixed RUN_ONCE no underscore (#…

    …86)
    
    * changed webhook json to auto-deciding + fixed RUN_ONCE no underscore
    
    * patched
    
    * patch 2 ?
    
    * final patch over 9000
    dirtycajunrice authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    782ad57 View commit details
  3. install flake8 for travis, run on appropriate directories (#87)

    * install flake8 for travis, run on appropriate directories
    
    * make deploy script consistent
    
    * update travis.yml to be consistent with uppercase shell vars
    circa10a authored Jan 13, 2019
    Copy the full SHA
    29b08d0 View commit details
  4. Copy the full SHA
    02861a3 View commit details
  5. Copy the full SHA
    9a972f4 View commit details
  6. logic swap

    dirtycajunrice committed Jan 13, 2019
    Copy the full SHA
    8ca5e7d View commit details
  7. missed a brace (#90)

    circa10a authored Jan 13, 2019
    Copy the full SHA
    dd0864a View commit details
  8. Merge pull request #89 from pyouroboros/healthchecks-webhook

    add keep_alive url for healthchecks. Addresses half of #80
    dirtycajunrice authored Jan 13, 2019
    Copy the full SHA
    0e248a5 View commit details
  9. Copy the full SHA
    fd8b641 View commit details
  10. Fix dockerfile (#92)

    * use ouroboros script in dockerfile
    
    * local pip install
    circa10a authored Jan 13, 2019
    Copy the full SHA
    f8253d7 View commit details
  11. Copy the full SHA
    d8c5722 View commit details
  12. Copy the full SHA
    0aa4883 View commit details
  13. Copy the full SHA
    608093c View commit details
  14. Copy the full SHA
    efb608a View commit details
  15. Copy the full SHA
    7c9d121 View commit details
  16. Copy the full SHA
    ef9b3fd View commit details
  17. Copy the full SHA
    395d371 View commit details
  18. broke some of the docs out to the wiki

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    7e8c233 View commit details
  19. add badges

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    573d767 View commit details
  20. breakout timezone, notifications

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    6da2e4e View commit details
  21. fix wiki link

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    14c854a View commit details
  22. rename help options repository to registry

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    9b48ae8 View commit details
  23. added try catch

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    dbede7a View commit details
  24. recommended fix from dirtycajun

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    5d2b129 View commit details
  25. add additional raise for safety

    circa10a authored and circa10a committed Jan 13, 2019
    Copy the full SHA
    3315387 View commit details
  26. undo my redo

    dirtycajunrice committed Jan 13, 2019
    Copy the full SHA
    ea6b8b7 View commit details
  27. Merge pull request #93 from pyouroboros/pushover

    add pushover functionality. Finishes other half of #80
    dirtycajunrice authored Jan 13, 2019
    Copy the full SHA
    fcc955d View commit details
  28. Copy the full SHA
    5fd6974 View commit details
  29. Copy the full SHA
    c952e55 View commit details
  30. Copy the full SHA
    9561ecb View commit details
  31. Copy the full SHA
    39c827b View commit details
  32. Copy the full SHA
    02976e7 View commit details

Commits on Jan 14, 2019

  1. Copy the full SHA
    7469c51 View commit details
Showing with 1,922 additions and 1,601 deletions.
  1. +0 −2 .coveragerc
  2. +0 −9 .dockerignore
  3. +1 −0 .github/FUNDING.yml
  4. +19 −0 .github/dependabot.yml
  5. +1 −0 .gitignore
  6. +149 −0 .gitlab-ci.yml
  7. +0 −24 .travis.yml
  8. +510 −0 CHANGELOG.md
  9. +14 −2 Dockerfile
  10. +18 −0 Dockerfile.arm
  11. +18 −0 Dockerfile.arm64
  12. +0 −6 Dockerfile.rpi
  13. +2 −0 MANIFEST.in
  14. +23 −317 README.md
  15. BIN assets/ouroboros_logo_primary.png
  16. BIN assets/ouroboros_logo_primary_cropped.jpg
  17. BIN assets/ouroboros_logo_primary_cropped.png
  18. BIN assets/ouroboros_logo_primary_discord.jpg
  19. BIN assets/ouroboros_logo_primary_long_cropped.jpg
  20. BIN assets/ouroboros_logo_primary_smaller_square_crop.png
  21. +0 −31 deploy.sh
  22. +0 −10 dev-environment.yml
  23. +0 −11 doc/CHANGELOG.md
  24. +16 −0 docker-compose.yml
  25. +0 −6 environment.yml
  26. +5 −0 ouroboros
  27. 0 ouroboros/__init__.py
  28. +0 −90 ouroboros/cli.py
  29. +0 −75 ouroboros/container.py
  30. +0 −9 ouroboros/defaults.py
  31. +0 −39 ouroboros/image.py
  32. +0 −16 ouroboros/logger.py
  33. +0 −53 ouroboros/main.py
  34. +0 −17 ouroboros/metrics.py
  35. +0 −22 ouroboros/ouroboros
  36. +2 −0 pyouroboros/__init__.py
  37. +153 −0 pyouroboros/config.py
  38. +136 −0 pyouroboros/dataexporters.py
  39. +462 −0 pyouroboros/dockerclient.py
  40. +41 −0 pyouroboros/helpers.py
  41. +53 −0 pyouroboros/logger.py
  42. +63 −0 pyouroboros/notifiers.py
  43. +211 −0 pyouroboros/ouroboros.py
  44. +0 −7 requirements-dev.txt
  45. +6 −3 requirements.txt
  46. +0 −52 run_tests.sh
  47. +19 −14 setup.py
  48. +0 −119 tests/integration/main_test.py
  49. +0 −17 tests/unit/_metrics_test.py
  50. +0 −216 tests/unit/cli_test.py
  51. +0 −228 tests/unit/container_object.py
  52. +0 −55 tests/unit/container_test.py
  53. +0 −15 tests/unit/defaults_test.py
  54. +0 −35 tests/unit/image_test.py
  55. +0 −16 tests/unit/logger_test.py
  56. +0 −85 tests/unit/main_unit_test.py
2 changes: 0 additions & 2 deletions .coveragerc

This file was deleted.

9 changes: 0 additions & 9 deletions .dockerignore

This file was deleted.

1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
custom: https://buymeacoff.ee/ouroboros
19 changes: 19 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10

- package-ecosystem: docker
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10

- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -116,3 +116,4 @@ dmypy.json
# JetBrains
.idea/
*.iml

149 changes: 149 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
stages:
- test
- build and push
- manifests
- release

.common_build: &common_build
image: docker:stable
stage: build and push
variables:
DOCKER_HOST: tcp://docker:2375/
DOCKER_DRIVER: overlay2
services:
- docker:dind
except:
- tags
only:
changes:
- "Dockerfile*"
- ouroboros
- pyouroboros/*
- .gitlab-ci.yml
before_script:
- mkdir $HOME/.docker
- echo '{"experimental":"enabled"}' > $HOME/.docker/config.json
- if [[ $CI_COMMIT_REF_NAME == "master" ]]; then
export TAG=$(grep -i version pyouroboros/__init__.py | cut -d \ -f3 | tr -d \");
else
export TAG="develop";
fi
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
- export CI_PROJECT_PATH=$(echo $CI_PROJECT_PATH | tr "[:upper:]" "[:lower:]")

.common_release: &common_release
<<: *common_build
tags:
- docker
- shared
only:
refs:
- master

flake8:
image: python:3.7.3-alpine
stage: test
cache:
key: "ouroboros-cache"
paths:
- .cache/pip
- venv/
variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
tags:
- shared
before_script:
- python -m venv venv
- source venv/bin/activate
- pip install -U flake8
script:
- flake8 --max-line-length 120 ouroboros *.py pyouroboros/*.py

amd64:
<<: *common_build
tags:
- docker
- shared
script:
- docker build --pull
--cache-from "$CI_PROJECT_PATH":"$TAG-amd64"
-t "$CI_PROJECT_PATH":"$TAG-amd64" .
- docker push "$CI_PROJECT_PATH":"$TAG-amd64"

armv6:
<<: *common_build
tags:
- docker
- arm
script:
- docker build --pull
--cache-from "$CI_PROJECT_PATH":"$TAG-arm"
-t "$CI_PROJECT_PATH":"$TAG-arm"
-f Dockerfile.arm .
- docker push "$CI_PROJECT_PATH":"$TAG-arm"

arm64v8:
<<: *common_build
tags:
- docker
- arm64
script:
- docker build --pull
--cache-from "$CI_PROJECT_PATH":"$TAG-arm64"
-t "$CI_PROJECT_PATH":"$TAG-arm64"
-f Dockerfile.arm64 .
- docker push "$CI_PROJECT_PATH":"$TAG-arm64"

versioned:
<<: *common_build
stage: manifests
tags:
- docker
- shared
script:
- docker manifest create "$CI_PROJECT_PATH":"$TAG"
"$CI_PROJECT_PATH":"$TAG-amd64"
"$CI_PROJECT_PATH":"$TAG-arm64"
"$CI_PROJECT_PATH":"$TAG-arm"
- docker manifest push -p "$CI_PROJECT_PATH":"$TAG"

latest:
<<: *common_release
stage: manifests
tags:
- docker
script:
- docker manifest create "$CI_PROJECT_PATH":latest
"$CI_PROJECT_PATH":"$TAG-amd64"
"$CI_PROJECT_PATH":"$TAG-arm64"
"$CI_PROJECT_PATH":"$TAG-arm"
- docker manifest push -p "$CI_PROJECT_PATH":latest

github:
<<: *common_release
stage: release
script:
- apk add git
- git remote set-url origin "https://$GITHUB_USER:$GITHUB_TOKEN@github.com/$CI_PROJECT_PATH.git"
- git tag $TAG
- git push --tags

pypi:
<<: *common_release
image: python:3.7.3-alpine
stage: release
cache:
key: "ouroboros-cache"
paths:
- .cache/pip
- venv/
variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
tags:
- shared
before_script:
- python -m venv venv
- source venv/bin/activate
- pip install -U twine
script:
- venv/bin/python setup.py sdist && venv/bin/python -m twine upload --skip-existing -u ${PYPI_CREDS_USR} -p ${PYPI_CREDS_PSW} dist/*
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

Loading