Merge pull request #123 from VAR-Virtual-Air-Rescue/staging

Bugfux und Node Exporter für Prometheus

apps/dispatch/app/_components/Audio/Audio.tsx

@@ -39,6 +39,7 @@ export const Audio = () => {
 		removeMessage,
 	} = useAudioStore();
 	const [selectedRoom, setSelectedRoom] = useState<string>("LST_01");
+
 	useSounds({
 		isReceiving: speakingParticipants.length > 0,
 		isTransmitting: isTalking,

apps/dispatch/app/_components/Audio/useSounds.ts

@@ -27,7 +27,7 @@ export const useSounds = ({
 	useEffect(() => {
 		if (!window) return;
 		connectionStart.current = new Audio("/sounds/connection_started_sepura.mp3");
-		connectionEnd.current = new Audio("/sounds/connection_stoped_sepura.mp3");
+		connectionEnd.current = new Audio("/sounds/connection_stopped_sepura.mp3");
 		ownCallStarted.current = new Audio("/sounds/call_end_sepura.wav");
 		foreignCallStop.current = new Audio("/sounds/call_end_sepura.wav");
 		foreignCallBlocked.current = new Audio("/sounds/call_blocked_sepura.wav");

apps/dispatch/app/_store/audioStore.ts

@@ -251,10 +251,16 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 					);
 				});
 
-				set({
-					remoteParticipants: room.numParticipants === 0 ? 0 : room.numParticipants - 1, // Unreliable and delayed
-					speakingParticipants,
-				});
+				if (oldSpeakingParticipants.length !== speakingParticipants.length) {
+					set({
+						remoteParticipants: room.numParticipants === 0 ? 0 : room.numParticipants - 1, // Unreliable and delayed
+						speakingParticipants,
+					});
+				} else {
+					set({
+						remoteParticipants: room.numParticipants === 0 ? 0 : room.numParticipants - 1, // Unreliable and delayed
+					});
+				}
 			}, 500);
 		} catch (error: Error | unknown) {
 			console.error("Error occured: ", error);

apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx

@@ -189,20 +189,9 @@ export const ProfileForm: React.FC<ProfileFormProps> = ({ user }: ProfileFormPro
 									type="button"
 									className="btn btn-sm btn-outline"
 									onClick={() =>
-										form.setValue(
-											"permissions",
-											[
-												"LOGIN_NEXTCLOUD",
-												"PILOT",
-												"DISPO",
-												"AUDIO",
-												"ADMIN_EVENT",
-												"ADMIN_HELIPORT",
-											],
-											{
-												shouldDirty: true,
-											},
-										)
+										form.setValue("permissions", ["LOGIN_NEXTCLOUD", "PILOT", "DISPO", "AUDIO"], {
+											shouldDirty: true,
+										})
 									}
 									onSubmit={() => false}
 								>

packages/prometheus/prometheus.prod.yml

@@ -20,3 +20,10 @@ scrape_configs:
   - job_name: "traefik"
     static_configs:
       - targets: ["traefik:8080"] # Traefik dashboard endpoint
+  - job_name: "Node Exporter"
+    static_configs:
+      - targets:
+          [
+            "http://148.251.0.86:9100/metrics",
+            "http://148.251.0.86:9115/probe?target=https://virtualairrescue.com&module=http_2xx",
+          ]