- Git do Root C3SL

[Git][root/dmarc-report][main] [ADD] Mudando filtros para url query, datas no formato br, ordenação de...
by Guiusepe (＠godp21) 07 Ago '25

07 Ago '25

Guiusepe pushed to branch main at Root / DMARC Report Commits: 1c73d465 by godp21 at 2025-08-07T14:53:17-03:00 [ADD] Mudando filtros para url query, datas no formato br, ordenação de resultados por min e maxdate - - - - - 2 changed files: - README.md - backend.js Changes: ===================================== README.md ===================================== @@ -3,10 +3,12 @@ [x] Renomear a rota /details?serial=:serial para /reports/details/:serial. [x] ip e ip6 tão vindo em número/bytes, dá pra vir como uma string formatada de IP. [x] Criar uma rota pra baixar o XML, algo tipo /reports/:id.xml -[ ] Adicionar um /reports/extended/ que vem com cada linha "expandida", ou seja, já vem tipo um details em cada linha. +[x] Converter as datas para padrão BR +[x] Mudar padrão de argumentos pela URL para usar query +[x] Adicionar ordenação, tipo um ?sort ou ?order, daí a ordenação padrão poderia ser ?order=-maxdate, ou seja data máxima descendente. [ ] Adicionar paginação, ?page, ?offset, algo tipo 50 resultados por página ou escolhe via ?per_page. -[ ] Adicionar ordenação, tipo um ?sort ou ?order, daí a ordenação padrão poderia ser ?order=-maxdate, ou seja data máxima descendente. +[ ] Adicionar um /reports/extended/ que vem com cada linha "expandida", ou seja, já vem tipo um details em cada linha. [ ]O dmarc_result_max é igual ao dmarc_result_min no details, dá pra só mudar pra dmarc_result, esse é tipo um "score" do que passou. ### Filtros ===================================== backend.js ===================================== @@ -5,10 +5,22 @@ const ip = require('ip') ; const { createServer } = require('node:http') ; const express = require('express') ; const app = express() ; - +const { DateTime } = require('luxon') ; // Postgres client const { Client } = require('pg') ; + +// Auxiliar functions +function convertDate(date) { + return DateTime + .fromJSDate(date, { zone: 'utc' }) + .setZone('America/Sao_Paulo') + .toFormat('dd/MM/yyyy HH:mm:ss') ; +} +//############################################################################## + + + // Postgres queries ############################################################ const xml_query = ` SELECT @@ -102,6 +114,8 @@ const reports_query = ` AS rptrecord ON report.serial = rptrecord.serial + ORDER BY + @@@@ ` ; const details_query = ` @@ -146,10 +160,32 @@ app.get('/', (req, res) => { // Reports list app.get('/reports', (req, res) => { - pgClient.query(reports_query, (err, result) => { + const { sort } = req.query ; + + var sortStr = "" ; + switch (sort) { + case "maxdate": + sortStr = "maxdate ASC" ; + break ; + case "mindate": + sortStr = "mindate ASC" ; + break ; + case "-mindate": + sortStr = "mindate DESC" ; + break ; + default: + sortStr = "maxdate DESC" ; + } + + pgClient.query(reports_query.replace("@@@@", sortStr), (err, result) => { if (err) { console.log("ERROR: Unable to run query") ; } else { + // Converting results + result["rows"].forEach((row, index) => { + row["maxdate"] = convertDate(row["maxdate"]) ; + row["mindate"] = convertDate(row["mindate"]) ; + }) ; res.send(result["rows"]) ; } }) ; @@ -157,8 +193,13 @@ app.get('/reports', (req, res) => { //############################################################################## // Individual report details -app.get('/reports/details/:serial', (req, res) => { - pgClient.query(details_query, [req.params.serial], (err, result) => { +app.get('/reports/details', (req, res) => { + const { serial } = req.query ; + if (! serial) { + res.send("No serial specified...") ; + return + } + pgClient.query(details_query, [serial], (err, result) => { if (err) { console.log("ERROR: Unable to run query") ; console.log(err) ; @@ -202,9 +243,8 @@ app.get('/reports/:serial.xml', (req, res) => { //############################################################################## app.get('/test', (req, res) => { - pgClient.query("SELECT * FROM report WHERE serial = 100000000", (err, result) => { - res.send(result) ; - }) ; + const { var1, var2, var3 } = req.query + res.send(`${var1} ${var2} ${var3}`) ; }) ; app.listen(3001, () => { View it on GitLab: https://gitlab.c3sl.ufpr.br/root/dmarc-report/-/commit/1c73d465452be71c0d46… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/dmarc-report/-/commit/1c73d465452be71c0d46… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] refactor(wordpress and rallly): move ingress to stage overlay
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: 61773852 by yyvf at 2025-08-07T11:38:24-03:00 refactor(wordpress and rallly): move ingress to stage overlay Issue #9 - - - - - 5 changed files: - apps/base/rallly/kustomization.yaml - apps/base/wordpress/kustomization.yaml - apps/stage/kustomization.yaml - apps/base/rallly/ing.yaml → apps/stage/rallly/ing.yaml - apps/base/wordpress/ing.yaml → apps/stage/wordpress/ing.yaml Changes: ===================================== apps/base/rallly/kustomization.yaml ===================================== @@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - deploy.yaml - - ing.yaml - ns.yaml - svc.yaml ===================================== apps/base/wordpress/kustomization.yaml ===================================== @@ -6,4 +6,3 @@ resources: - deploy.yaml - svc.yaml - pvc.yaml - - ing.yaml ===================================== apps/stage/kustomization.yaml ===================================== @@ -8,5 +8,7 @@ resources: - ../base/matrix - ../base/nextcloud - ../base/rallly + - ./rallly/ing.yaml - ../base/wordpress + - ./wordpress/ing.yaml - ../base/netbox ===================================== apps/base/rallly/ing.yaml → apps/stage/rallly/ing.yaml ===================================== ===================================== apps/base/wordpress/ing.yaml → apps/stage/wordpress/ing.yaml ===================================== View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/61773852088c2938235bc6… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/61773852088c2938235bc6… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] refactor(codimd): move ingress definition to stage overlay
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: b940c008 by yyvf at 2025-08-07T10:49:17-03:00 refactor(codimd): move ingress definition to stage overlay Issue #9 - - - - - 3 changed files: - apps/base/codimd/kustomization.yaml - apps/base/codimd/ing.yaml → apps/stage/codimd/ing.yaml - apps/stage/kustomization.yaml Changes: ===================================== apps/base/codimd/kustomization.yaml ===================================== @@ -1,8 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - deploy.yaml - - ing.yaml - ns.yaml + - deploy.yaml - pvc.yaml - svc.yaml ===================================== apps/base/codimd/ing.yaml → apps/stage/codimd/ing.yaml ===================================== ===================================== apps/stage/kustomization.yaml ===================================== @@ -4,6 +4,7 @@ resources: - ../base/ademir - ./ademir/ing.yaml - ../base/codimd + - ./codimd/ing.yaml - ../base/matrix - ../base/nextcloud - ../base/rallly View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/b940c0089a03d1679bc92b… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/b940c0089a03d1679bc92b… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] refactor(ademir): move ademir ing to stage overlay
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: 2204dcff by yyvf at 2025-08-07T10:36:38-03:00 refactor(ademir): move ademir ing to stage overlay Issue #9 - - - - - 3 changed files: - apps/base/ademir/kustomization.yaml - apps/base/ademir/ing.yaml → apps/stage/ademir/ing.yaml - apps/stage/kustomization.yaml Changes: ===================================== apps/base/ademir/kustomization.yaml ===================================== @@ -4,6 +4,5 @@ resources: - ns.yaml - deploy.yaml - svc.yaml - - ing.yaml - externalsecret.yaml - cnp.yaml ===================================== apps/base/ademir/ing.yaml → apps/stage/ademir/ing.yaml ===================================== ===================================== apps/stage/kustomization.yaml ===================================== @@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../base/ademir + - ./ademir/ing.yaml - ../base/codimd - ../base/matrix - ../base/nextcloud View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/2204dcff0cc408fc81ee26… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/2204dcff0cc408fc81ee26… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] refactor(openbao): move ingress definition to stage overlay
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: dbe34d87 by yyvf at 2025-08-07T10:30:43-03:00 refactor(openbao): move ingress definition to stage overlay Issue #9 - - - - - 3 changed files: - infrastructure/base/openbao/helmrelease.yaml - infrastructure/stage/kustomization.yaml - + infrastructure/stage/openbao/helmrelease.yaml Changes: ===================================== infrastructure/base/openbao/helmrelease.yaml ===================================== @@ -45,19 +45,3 @@ spec: } service_registration "kubernetes" {} - ingress: - enabled: true - annotations: - ingress.cilium.io/loadbalancer-mode: dedicated - ingress.cilium.io/service-type: LoadBalancer - cert-manager.io/cluster-issuer: letsencrypt-dns01 - ingressClassName: cilium - pathType: Prefix - hosts: - - host: openbao.k8sstage.c3sl.ufpr.br - - host: openbao.c3sl.ufpr.br - tls: - - secretName: openbao-tls - hosts: - - openbao.k8sstage.c3sl.ufpr.br - - openbao.c3sl.ufpr.br ===================================== infrastructure/stage/kustomization.yaml ===================================== @@ -12,3 +12,8 @@ resources: - ../base/keycloak - ./keycloak/ing.yaml - ../base/etcd-backup +patches: + - path: ./openbao/helmrelease.yaml + target: + kind: HelmRelease + name: openbao ===================================== infrastructure/stage/openbao/helmrelease.yaml ===================================== @@ -0,0 +1,31 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: openbao + namespace: openbao +spec: + interval: 1m + chart: + spec: + chart: openbao + sourceRef: + kind: HelmRepository + name: openbao + values: + server: + ingress: + enabled: true + annotations: + ingress.cilium.io/loadbalancer-mode: dedicated + ingress.cilium.io/service-type: LoadBalancer + cert-manager.io/cluster-issuer: letsencrypt-dns01 + ingressClassName: cilium + pathType: Prefix + hosts: + - host: openbao.k8sstage.c3sl.ufpr.br + - host: openbao.c3sl.ufpr.br + tls: + - secretName: openbao-tls + hosts: + - openbao.k8sstage.c3sl.ufpr.br + - openbao.c3sl.ufpr.br View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/dbe34d87b592d9ee5259df… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/dbe34d87b592d9ee5259df… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/services/dns][main] add gst22-113.c3local -> 10.254.221.79
by Bruno Sime Ferreira Nunes (＠bsfn19) 07 Ago '25

07 Ago '25

Bruno Sime Ferreira Nunes pushed to branch main at Root / Serviços / DNS Commits: 5ecc5501 by Bruno Sime at 2025-08-07T09:57:29-03:00 add gst22-113.c3local -> 10.254.221.79 - - - - - 2 changed files: - interna-254.10.in-addr.arpa.zone - interna-c3local.zone Changes: ===================================== interna-254.10.in-addr.arpa.zone ===================================== @@ -441,6 +441,7 @@ $TTL 21600 78.221 IN PTR eros.c3local. 78.223 IN PTR h50.c3local. 78.249 IN PTR kiev2.c3local. +79.221 IN PTR gst22-113.c3local. 79.223 IN PTR h51.c3local. 79.249 IN PTR kiev1-ipmi.c3local. 80.223 IN PTR h52.c3local. @@ -473,4 +474,4 @@ $TTL 21600 249.227 IN PTR mojito7.c3local. @ IN NS ns2.c3sl.ufpr.br. @ IN NS ns.c3sl.ufpr.br. -@ 21600 IN SOA ns.c3sl.ufpr.br. root.c3sl.ufpr.br. 1754501007 86400 7200 2592000 3600 +@ 21600 IN SOA ns.c3sl.ufpr.br. root.c3sl.ufpr.br. 1754571004 86400 7200 2592000 3600 ===================================== interna-c3local.zone ===================================== @@ -71,7 +71,7 @@ brioja IN A 10.254.221.54 buxfox IN A 10.254.237.8 @ IN NS ns2.c3sl.ufpr.br. @ IN NS ns.c3sl.ufpr.br. -@ 21600 IN SOA ns.c3sl.ufpr.br. root.c3sl.ufpr.br. 1754501008 86400 7200 2592000 3600 +@ 21600 IN SOA ns.c3sl.ufpr.br. root.c3sl.ufpr.br. 1754571004 86400 7200 2592000 3600 caio IN A 10.254.221.1 calvin IN A 10.254.229.6 carate IN A 10.254.221.43 @@ -128,6 +128,7 @@ gonzo IN A 10.254.221.20 gps20-118 IN A 10.254.221.61 grogu IN A 10.254.237.5 gsfa22-118 IN A 10.254.221.55 +gst22-113 IN A 10.254.221.79 guilherme-c3sl IN A 10.254.221.12 h1 IN A 10.254.223.29 h2 IN A 10.254.223.30 View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/dns/-/commit/5ecc550112efc17437cc… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/dns/-/commit/5ecc550112efc17437cc… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] feat(external-secrets): update cluster store server name
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: 9da8cfe8 by yyvf at 2025-08-07T09:56:38-03:00 feat(external-secrets): update cluster store server name - - - - - 1 changed file: - infrastructure/base/external-secrets/clustersecretstore.yaml Changes: ===================================== infrastructure/base/external-secrets/clustersecretstore.yaml ===================================== @@ -5,7 +5,7 @@ metadata: spec: provider: vault: - server: "https://openbao.k8sstage.c3sl.ufpr.br" + server: "https://openbao.c3sl.ufpr.br" path: "kv" version: "v2" auth: View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/9da8cfe8d079e9ab809be4… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/9da8cfe8d079e9ab809be4… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/services/dhcp][main] add gst22-113 -> 60:c7:27:2d:b0:0c -> 10.254.221.79
by Bruno Sime Ferreira Nunes (＠bsfn19) 07 Ago '25

07 Ago '25

Bruno Sime Ferreira Nunes pushed to branch main at Root / Serviços / DHCP Commits: 325872f3 by Bruno Sime at 2025-08-07T09:53:20-03:00 add gst22-113 -> 60:c7:27:2d:b0:0c -> 10.254.221.79 - - - - - 1 changed file: - kea-dhcp4.conf Changes: ===================================== kea-dhcp4.conf ===================================== @@ -311,12 +311,6 @@ ], "user-context": { "nextbox_ip_address_id": 1542 } }, - { - "hostname": "openbao", - "hw-address": "00:16:CC:AA:00:F1", - "ip-address": "200.17.202.51", - "user-context": { "nextbox_ip_address_id": 1545 } - }, { "hostname": "tars", "hw-address": "00:60:DD:46:53:CD", @@ -4489,6 +4483,12 @@ "ip-address": "10.254.221.78", "user-context": { "nextbox_ip_address_id": 2764 } }, + { + "hostname": "gst22-113", + "hw-address": "60:C7:27:2D:B0:0C", + "ip-address": "10.254.221.79", + "user-context": { "nextbox_ip_address_id": 2777 } + }, { "hostname": "deathstar", "hw-address": "70:85:C2:08:88:8B", View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/dhcp/-/commit/325872f39016276409b… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/services/dhcp/-/commit/325872f39016276409b… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] fix(keycloak): kustomization referring null object
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: e683fccd by yyvf at 2025-08-07T09:52:24-03:00 fix(keycloak): kustomization referring null object - - - - - 1 changed file: - infrastructure/base/keycloak/kustomization.yaml Changes: ===================================== infrastructure/base/keycloak/kustomization.yaml ===================================== @@ -6,5 +6,4 @@ resources: - ns.yaml - sts.yaml - svc.yaml - - ing.yaml - es.yaml View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/e683fccdb5eaba07263c45… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/commit/e683fccdb5eaba07263c45… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0

[Git][root/k8s/fluxcd][main] 2 commits: refactor(keycloak and cilium)
by yyvf22 (＠yyvf22) 07 Ago '25

07 Ago '25

yyvf22 pushed to branch main at Root / Kubernetes / FluxCD Commits: 449a508a by yyvf at 2025-08-07T09:49:32-03:00 refactor(keycloak and cilium) Issue #9 - - - - - f69fd221 by yyvf at 2025-08-07T09:50:24-03:00 Merge branch 'main' of gitlab.c3sl.ufpr.br:root/k8s/fluxcd - - - - - 3 changed files: - infrastructure/stage/ippool.yaml → infrastructure/stage/cilium/ippool.yaml - infrastructure/base/keycloak/ing.yaml → infrastructure/stage/keycloak/ing.yaml - infrastructure/stage/kustomization.yaml Changes: ===================================== infrastructure/stage/ippool.yaml → infrastructure/stage/cilium/ippool.yaml ===================================== ===================================== infrastructure/base/keycloak/ing.yaml → infrastructure/stage/keycloak/ing.yaml ===================================== ===================================== infrastructure/stage/kustomization.yaml ===================================== @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../base/cilium - - ./ippool.yaml + - ./cilium/ippool.yaml - ../base/ceph-csi - ../base/cert-manager - ../base/openbao @@ -10,4 +10,5 @@ resources: - ../base/harbor - ../base/gitlab-runner - ../base/keycloak + - ./keycloak/ing.yaml - ../base/etcd-backup View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/compare/be986c1b97f169cdde0e0… -- View it on GitLab: https://gitlab.c3sl.ufpr.br/root/k8s/fluxcd/-/compare/be986c1b97f169cdde0e0… You're receiving this email because of your account on gitlab.c3sl.ufpr.br.

1 0