Merge pull request #13 from opentelekomcloud-infra/metric

Metric reimplementation

Author: gtema

.dockerignore

@@ -1,3 +1,5 @@
 .eggs/**
 .tox/**
 .stestr/**
+wrk/**
+wrk_executor/**

.zuul.yaml

@@ -9,36 +9,36 @@
     vars: &apimon_image_vars
       docker_images:
         - context: .
-          repository: otcinfra/apimon
+          repository: opentelekomcloud/apimon
           tags:
             # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ].  Only works for 3-component tags.
             # Otherwise: ['latest']
             &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}"
 
 - job:
     name: apimon-upload-image
-    parent: otcinfra-upload-image
+    parent: otcinfra-upload-image-quay
     provides: apimon-container-image
     vars: *apimon_image_vars
 
 - job:
     name: apimon-promote-image
-    parent: otcinfra-promote-image
+    parent: otcinfra-promote-image-quay
     vars: *apimon_image_vars
 
 - project:
     merge-mode: squash-merge
     check:
       jobs:
-        - tox-pep8
-        - tox-py38
+        - otc-tox-pep8
+        - otc-tox-py38
         - apimon-build-image
     check-post:
       jobs:
         - apimon-upload-image
     gate:
       jobs:
-        - tox-pep8
+        - otc-tox-pep8
         - apimon-upload-image
     promote:
       jobs:

Dockerfile

@@ -10,26 +10,40 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM fedora:32
+FROM fedora:33
 
-RUN dnf --disablerepo updates-modular --disablerepo fedora-modular \
-    install -y git gcc python3-devel python3-setuptools python3-pip nmap-ncat procps-ng
+LABEL description="APImon (OpenStack API monitoring) container"
+LABEL maintainer="Open Telekom Cloud (ecosystem)"
 
-WORKDIR /usr/app
-ENV PATH=/root/.local/bin:$PATH
-RUN mkdir -p /var/{lib/apimon,log/apimon}
+RUN dnf --disablerepo updates-modular --disablerepo fedora-modular \
+    install -y git gcc nmap-ncat procps-ng net-tools xz \
+    python3-devel python3-setuptools python3-pip \
+    python3-psycopg2 python3-sqlalchemy \
+    python3-dns && dnf clean all
 
 RUN git config --global user.email "apimon@test.com"
 RUN git config --global user.name "apimon"
 
+RUN useradd apimon
+
+RUN mkdir -p /var/{lib/apimon,log/apimon,log/executor,log/scheduler}
+
+RUN chown apimon:apimon /var/lib/apimon && chown -R apimon:apimon /var/log/apimon
+
+WORKDIR /usr/app
+
 COPY ./requirements.txt /usr/app/requirements.txt
 
-#RUN git clone https://github.com/ansible/ansible --branch stable-2.10 && \
-#    git clone https://review.opendev.org/openstack/openstacksdk
+RUN \ 
+     git clone https://github.com/opentelekomcloud/python-otcextensions && \
+#    git clone https://github.com/ansible/ansible --branch stable-2.10 && \
+     git clone https://review.opendev.org/openstack/openstacksdk
 
-#RUN cd ansible && python3 setup.py install --user
+RUN pip3 install -r /usr/app/requirements.txt
 
-RUN pip3 install --user -r /usr/app/requirements.txt
+#RUN cd ansible && python3 setup.py install --user
+RUN cd openstacksdk && python3 setup.py install --force
+RUN cd python-otcextensions && python3 setup.py install --force
 
 ADD . /usr/app/apimon
 
@@ -39,8 +53,10 @@ ADD . /usr/app/apimon
 #     && git checkout FETCH_HEAD \
 #     && python3 setup.py install --user
 
-RUN cd apimon && python3 setup.py install --user
+RUN cd apimon && python3 setup.py install
+
+RUN rm -rf /usr/app/{ansible,apimon,python-otcextensions}
 
-RUN rm -rf /usr/app/ansible
+USER apimon
 
-ENV PATH=/root/.local/bin:$PATH
+ENV HOME=/home/apimon