Skip to content

[pull] master from louislam:master #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Feb 24, 2026
Merged

[pull] master from louislam:master #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions server/monitor-types/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ class DnsMonitorType extends MonitorType {
let dnsMessage = "";

const resolverServers = await this.resolveDnsResolverServers(monitor.dns_resolve_server);
let dnsRes = await this.dnsResolve(monitor.hostname, resolverServers, monitor.port, monitor.dns_resolve_type);
let dnsRes = await this.dnsResolve(
monitor.hostname,
resolverServers,
monitor.port,
monitor.dns_resolve_type,
monitor.timeout != null ? monitor.timeout * 1000 : 5000
);
heartbeat.ping = dayjs().valueOf() - startTime;

const conditions = ConditionExpressionGroup.fromMonitor(monitor);
Expand Down Expand Up @@ -169,10 +175,11 @@ class DnsMonitorType extends MonitorType {
* @param {string[]} resolverServer Array of DNS server IP addresses to use
* @param {string} resolverPort Port the DNS server is listening on
* @param {string} rrtype The type of record to request
* @param {number} timeout Timeout in milliseconds for the DNS query (defaults to c-ares default of 5000ms)
* @returns {Promise<(string[] | object[] | object)>} DNS response
*/
async dnsResolve(hostname, resolverServer, resolverPort, rrtype) {
const resolver = new Resolver();
async dnsResolve(hostname, resolverServer, resolverPort, rrtype, timeout = 5000) {
const resolver = new Resolver({ timeout });
resolver.setServers(resolverServer.map((server) => `[${server}]:${resolverPort}`));
if (rrtype === "PTR") {
return await resolver.reverse(hostname);
Expand Down
1 change: 1 addition & 0 deletions src/pages/EditMonitor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,7 @@
<!-- Timeout: HTTP / JSON query / Keyword / Ping / RabbitMQ / SNMP / Websocket Upgrade only -->
<div
v-if="
monitor.type === 'dns' ||
monitor.type === 'http' ||
monitor.type === 'json-query' ||
monitor.type === 'keyword' ||
Expand Down
Loading