diff --git a/.gitignore b/.gitignore index b512c09..bfe33eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -node_modules \ No newline at end of file +node_modules +.env +logagent-daemonset*.yaml +logagent.conf \ No newline at end of file diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml new file mode 100644 index 0000000..69bbd58 --- /dev/null +++ b/.semaphore/semaphore.yml @@ -0,0 +1,63 @@ +version: v1.0 +name: First pipeline example +agent: + machine: + type: e1-standard-2 + os_image: ubuntu1804 + +blocks: + - name: "Build" + task: + env_vars: + - name: APP_ENV + value: prod + jobs: + - name: Docker build + commands: + - checkout + - ls + - echo $APP_ENV + - echo "Docker build..." + - echo "done" + + - name: "Smoke tests" + task: + jobs: + - name: Smoke + commands: + - checkout + - echo "make smoke" + + - name: "Unit tests" + task: + jobs: + - name: RSpec + commands: + - checkout + - echo "make rspec" + + - name: Lint code + commands: + - checkout + - echo "make lint" + + - name: Check security + commands: + - checkout + - echo "make security" + + - name: "Integration tests" + task: + jobs: + - name: Cucumber + commands: + - checkout + - echo "make cucumber" + + - name: "Push Image" + task: + jobs: + - name: Push + commands: + - checkout + - echo "make docker.push" diff --git a/app-one-deployment.yaml b/app-one-deployment.yaml new file mode 100644 index 0000000..6c2dacf --- /dev/null +++ b/app-one-deployment.yaml @@ -0,0 +1,42 @@ +# apiVersion: extensions/v1beta1 +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.service.type: LoadBalancer + kompose.version: 1.1.0 (36652f6) + creationTimestamp: null + labels: + io.kompose.service: app-one + name: app-one +spec: + selector: + matchLabels: + io.kompose.service: app-one + replicas: 1 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: app-one + # annotations: + # "sematext.com/logs-enabled": "true" + # "sematext.com/logs-receiver-urls": "https://logs-token-receiver.apps.test.sematext.com/your-token, https://logs-token-receiver.apps.test.sematext.com/your-token" + # "sematext.com/logs-receiver-url": "https://logsene-receiver.sematext.com" + # "sematext.com/logs-token": "your-token" + spec: + containers: + - env: + - name: GET_HOSTS_FROM + value: "dns" + - name: LOGS_ENABLED + value: "true" + image: adnanrahic/express-docker-app:tattle-v1 + name: app-one + ports: + - containerPort: 3000 + resources: {} + restartPolicy: Always +status: {} diff --git a/app-service.yaml b/app-service.yaml new file mode 100644 index 0000000..93693bb --- /dev/null +++ b/app-service.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert + kompose.service.type: LoadBalancer + kompose.version: 1.1.0 (36652f6) + creationTimestamp: null + labels: + io.kompose.service: app + name: app +spec: + ports: + - name: "80" + port: 80 + targetPort: 3000 + externalIPs: + - 192.168.99.102 + selector: + io.kompose.service: app + type: LoadBalancer +status: + loadBalancer: {} diff --git a/app-three-deployment.yaml b/app-three-deployment.yaml new file mode 100644 index 0000000..f0ccc64 --- /dev/null +++ b/app-three-deployment.yaml @@ -0,0 +1,42 @@ +# apiVersion: extensions/v1beta1 +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.service.type: LoadBalancer + kompose.version: 1.1.0 (36652f6) + creationTimestamp: null + labels: + io.kompose.service: app-three + name: app-three +spec: + selector: + matchLabels: + io.kompose.service: app-three + replicas: 1 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: app-three + # annotations: + # "sematext.com/logs-enabled": "true" + # "sematext.com/logs-receiver-urls": "https://logs-token-receiver.apps.test.sematext.com/your-token, https://logs-token-receiver.apps.test.sematext.com/your-token" + # "sematext.com/logs-receiver-url": "https://logsene-receiver.sematext.com" + # "sematext.com/logs-token": "your-token" + spec: + containers: + - env: + - name: GET_HOSTS_FROM + value: "dns" + - name: LOGS_ENABLED + value: "true" + image: adnanrahic/express-docker-app:test-monit-3 + name: app-three + ports: + - containerPort: 3000 + resources: {} + restartPolicy: Always +status: {} diff --git a/app-two-deployment.yaml b/app-two-deployment.yaml new file mode 100644 index 0000000..cf2a431 --- /dev/null +++ b/app-two-deployment.yaml @@ -0,0 +1,42 @@ +# apiVersion: extensions/v1beta1 +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert + kompose.service.type: LoadBalancer + kompose.version: 1.1.0 (36652f6) + creationTimestamp: null + labels: + io.kompose.service: app-two + name: app-two +spec: + selector: + matchLabels: + io.kompose.service: app-two + replicas: 1 + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + io.kompose.service: app-two + # annotations: + # "sematext.com/logs-enabled": "true" + # "sematext.com/logs-receiver-urls": "https://logs-token-receiver.apps.test.sematext.com/your-token, https://logs-token-receiver.apps.test.sematext.com/your-token" + # "sematext.com/logs-receiver-url": "https://logsene-receiver.sematext.com" + # "sematext.com/logs-token": "your-token" + spec: + containers: + - env: + - name: GET_HOSTS_FROM + value: "dns" + - name: LOGS_ENABLED + value: "true" + image: adnanrahic/express-docker-app:tattle-v2 + name: app-two + ports: + - containerPort: 3000 + resources: {} + restartPolicy: Always +status: {} diff --git a/app.js b/app.js index b87acaa..06d4ad1 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,14 @@ const express = require('express') const app = express() + +setInterval(() => { + console.log('status') + console.log('[e383cdcd-9fb2-4d39-9e23-f3c16d1f977c] [c2education] Completed 500 Internal Server Error in 749ms (Views: 0.2ms | ActiveRecord: 481.3ms)') +}, 1000) + app.get('/', async (req, res, next) => { res.status(200).send('Hello World!') + console.log('Hello World!') }) -app.listen(3000, () => console.log('Server is running on port 3000')) +app.listen(3000, () => + console.log('Server is running on port 3000')) diff --git a/docker-compose.yml b/docker-compose.yml index 92198fd..4118055 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,13 @@ version: "3" services: app: - build: - context: ./ - dockerfile: Dockerfile + build: ./Dockerfile image: adnanrahic/express-docker-app deploy: - mode: replicated replicas: 6 - labels: [APP=APP] - update_config: - parallelism: 1 - delay: 10s - restart_policy: - condition: on-failure - delay: 5s ports: - - "80:3000" \ No newline at end of file + - "80:3000" + environment: + - GET_HOSTS_FROM=dns + labels: + kompose.service.type: LoadBalancer \ No newline at end of file diff --git a/spmdb/metrics.db.0.10161 b/spmdb/metrics.db.0.10161 new file mode 100644 index 0000000..e69de29 diff --git a/spmdb/metrics.db.0.10793 b/spmdb/metrics.db.0.10793 new file mode 100644 index 0000000..e69de29