updates to agents

Author: phrocker

.env

@@ -1,5 +1,5 @@
-SENTRIUS_VERSION=1.0.27
-SENTRIUS_SSH_VERSION=1.0.25
-SENTRIUS_KEYCLOAK_VERSION=1.0.17
-SENTRIUS_AGENT_VERSION=1.0.33
+SENTRIUS_VERSION=1.0.28
+SENTRIUS_SSH_VERSION=1.0.26
+SENTRIUS_KEYCLOAK_VERSION=1.0.18
+SENTRIUS_AGENT_VERSION=1.0.34
 SENTRIUS_AI_AGENT_VERSION=1.0.0

ai-agent/src/main/java/io/sentrius/agent/analysis/AiAgent.java

@@ -2,13 +2,15 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
-@SpringBootApplication(scanBasePackages = {"io.sentrius.agent", "io.sentrius.sso"})
-@EntityScan(basePackages = {"io.sentrius.sso.core.model", "io.sentrius.sentrius.ai.model"})
+@SpringBootApplication(scanBasePackages = {"io.sentrius.agent", "io.sentrius.sso"},
+    exclude = {
+        org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration.class,
+        org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration.class,
+        org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration.class
+    })
 @EnableScheduling
 public class AiAgent {
     public static void main(String[] args) {

ai-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/RegisteredAgent.java

@@ -29,7 +29,9 @@ public void onApplicationEvent(final ApplicationReadyEvent event) {
 
         String command = "ssh connect host123";
 
+        log.info("Registering agent...");
         zeroTrustClientService.requestZtatToken(user, command);
+        log.info("Registered agent is running");
         return;
     }
 

ai-agent/src/main/resources/application.properties

@@ -50,16 +50,16 @@ server.error.whitelabel.enabled=false
 
 keycloak.realm=sentrius
 keycloak.base-url=${KEYCLOAK_BASE_URL:http://localhost:8180}
-spring.security.oauth2.client.registration.keycloak.client-id=sentrius-api
-spring.security.oauth2.client.registration.keycloak.client-secret=nGkEukexSWTvDzYjSkDmeUlM0FJ5Jhh0
+spring.security.oauth2.client.registration.keycloak.client-id=sentrius-agent
+spring.security.oauth2.client.registration.keycloak.client-secret=HmS18jTiB3lH9JUsreZSVhlsUnj5NlqU
 spring.security.oauth2.client.registration.keycloak.authorization-grant-type=authorization_code
 spring.security.oauth2.client.registration.keycloak.redirect-uri=http://192.168.1.162:8080/login/oauth2/code/keycloak
 spring.security.oauth2.client.registration.keycloak.scope=openid,profile,email
 
 spring.security.oauth2.resourceserver.jwt.issuer-uri=http://192.168.1.162:8180/realms/sentrius
 spring.security.oauth2.client.provider.keycloak.issuer-uri=http://192.168.1.162:8180/realms/sentrius
 # for testing analytics agents
-agents.session-analytics.enabled=true
+agents.ai.registered.agent.enabled=true
 management.endpoints.web.exposure.include=health
 management.endpoint.health.show-details=always
-agent.api.url=http://
+agent.api.url=http://localhost:8080/

ops-scripts/local/deploy-helm.sh

@@ -26,7 +26,8 @@ fi
 helm upgrade --install sentrius ./sentrius-chart --namespace ${TENANT} \
     --set tenant=${TENANT} \
     --set subdomain="localhost" \
-    --set keycloakSubdomain="sentrius-keycloak:8081" \
+    --set keycloakSubdomain="sentrius-keycloak" \
+    --set keycloakHostname="sentrius-keycloak:8081" \
     --set keycloakDomain="http://sentrius-keycloak:8081" \
     --set sentriusDomain="http://sentrius:8080" \
     --set sentrius.image.repository="sentrius" \

sentrius-chart/templates/ingress.yaml

@@ -23,12 +23,12 @@ spec:
   {{- if .Values.ingress.tlsEnabled }}
   tls:
     - hosts:
-        - keycloak.{{ .Values.subdomain }}
+        - {{ .Values.keycloakSubdomain }}
         - {{ .Values.subdomain }}
       secretName: wildcard-cert-{{ .Values.tenant }}
   {{- end }}
   rules:
-    - host: keycloak.{{ .Values.subdomain }}
+    - host: {{ .Values.keycloakSubdomain }}
       http:
         paths:
           - path: /

sentrius-chart/templates/keycloak-deployment.yaml

@@ -55,7 +55,7 @@ spec:
             - name: KC_DB_PASSWORD
               value: {{ .Values.keycloak.db.password }}
             - name: KC_HOSTNAME
-              value: {{ .Values.keycloakSubdomain }}
+              value: {{ .Values.keycloakHostname }}
             - name: KC_HOSTNAME_STRICT
               value: "false"
             - name: KEYCLOAK_LOGLEVEL

sentrius-chart/values.yaml

@@ -7,6 +7,7 @@ environment: "gke"  # Can be "gke", "aws", "azure", "local"
 tenant: sentrius-demo
 subdomain: "{{ .Values.tenant }}.sentrius.cloud"
 keycloakSubdomain: keycloak.{{ .Values.subdomain }}
+keycloakHostname: "{{ .Values.keycloakSubdomain }}"
 keycloakDomain: https://{{ .Values.keycloakSubdomain }}
 sentriusDomain: https://{{ .Values.subdomain }}